languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-15 22:19:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[ Service / DDS ] Remove VM service polling logic, add --enable-service-fallback-port support to DDS"

Browse source 
This reverts commit bd8590ba9b.

Reason for revert: breaks google3 (b/224731131)

TEST=Clean revert

Original change's description:
> [ Service / DDS ] Remove VM service polling logic, add --enable-service-fallback-port support to DDS
>
> Polling logic was introduced due to a bug in Fuchsia's network stack
> which could result in the VM service attempting to start the server
> before the network stack was initialized. This issue should be resolved
> now, so this logic is no longer necessary.
>
> TEST=pkg/dartdev/test/commands/run_test.dart
>
> Change-Id: I10f185dfb1be1b0363983f3e0564d65c38c99ea8
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/235763
> Reviewed-by: Ryan Macnak <rmacnak@google.com>
> Commit-Queue: Ben Konyi <bkonyi@google.com>

TBR=bkonyi@google.com,rmacnak@google.com,asiva@google.com

Change-Id: I3016fad25220c4e5479f17294626d79a17bd316a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/237360
Reviewed-by: Alexander Thomas <athom@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Emmanuel Pellereau <emmanuelp@google.com>
Commit-Queue: Emmanuel Pellereau <emmanuelp@google.com>
This commit is contained in:
Emmanuel Pellereau 2022-03-15 12:01:30 +00:00 committed by Commit Bot
parent 7e4b88c0c9
commit d4f71515c7
8 changed files with 36 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/dartdev/lib/src/commands/run.dart
View file

@ -222,8 +222,6 @@ class RunCommand extends DartdevCommand {
final bool debugDds = args['debug-dds'];
bool disableServiceAuthCodes = args['disable-service-auth-codes'];
final bool enableServicePortFallback =
args['enable-service-port-fallback'];
// If the user wants to start a debugging session we need to do some extra
// work and spawn a Dart Development Service (DDS) instance. DDS is a VM
@ -239,7 +237,6 @@ class RunCommand extends DartdevCommand {
disableServiceAuthCodes,
launchDevTools,
debugDds,
enableServicePortFallback,
)) {
return errorExitCode;
}
@ -277,7 +274,6 @@ class _DebuggingSession {
bool disableServiceAuthCodes,
bool enableDevTools,
bool debugDds,
bool enableServicePortFallback,
) async {
final sdkDir = dirname(sdk.dart);
final fullSdk = sdkDir.endsWith('bin');
@ -307,7 +303,6 @@ class _DebuggingSession {
enableDevTools.toString(),
devToolsBinaries,
debugDds.toString(),
enableServicePortFallback.toString(),
],
mode: ProcessStartMode.detachedWithStdio,
);

19
pkg/dartdev/test/commands/run_test.dart
View file

@ -333,25 +333,6 @@ void main(List<String> args) => print("$b $args");
expect(result.exitCode, 0);
});
test('--enable-service-port-fallback', () async {
final p = project(mainSrc: '''void main() {}''');
final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
final result = await p.run(
[
'run',
'--enable-vm-service=${server.port}',
'--enable-service-port-fallback',
p.relativeFilePath,
],
);
final regexp = RegExp(
r'Observatory listening on http:\/\/127.0.0.1:(\d*)\/[a-zA-Z0-9_-]+=\/\n.*');
final vmServicePort =
int.parse(regexp.firstMatch(result.stdout)!.group(1)!);
expect(server.port != vmServicePort, isTrue);
await server.close();
});
test('without verbose CFE info', () async {
final p = project(mainSrc: '''void main() {}''');

3
pkg/dds/bin/dds.dart
View file

@ -18,7 +18,6 @@ import 'package:dds/dds.dart';
/// - Start DevTools
/// - DevTools build directory
/// - Enable logging
/// - Enable service port fallback
Future<void> main(List<String> args) async {
if (args.isEmpty) return;
@ -47,7 +46,6 @@ Future<void> main(List<String> args) async {
devToolsBuildDirectory = Uri.file(args[5]);
}
final logRequests = args[6] == 'true';
final enableServicePortFallback = args[7] == 'true';
try {
// TODO(bkonyi): add retry logic similar to that in vmservice_server.dart
// See https://github.com/dart-lang/sdk/issues/43192.
@ -63,7 +61,6 @@ Future<void> main(List<String> args) async {
)
: null,
logRequests: logRequests,
enableServicePortFallback: enableServicePortFallback,
);
stderr.write(json.encode({
'state': 'started',

5
pkg/dds/lib/dds.dart
View file

@ -37,15 +37,11 @@ abstract class DartDevelopmentService {
///
/// [ipv6] controls whether or not DDS is served via IPv6. IPv4 is enabled by
/// default.
///
/// If [enablesServicePortFallback] is enabled, DDS will attempt to bind to any
/// available port if the specified port is unavailable.
static Future<DartDevelopmentService> startDartDevelopmentService(
Uri remoteVmServiceUri, {
Uri? serviceUri,
bool enableAuthCodes = true,
bool ipv6 = false,
bool enableServicePortFallback = false,
List<String> cachedUserTags = const [],
DevToolsConfiguration? devToolsConfiguration,
bool logRequests = false,
@ -88,7 +84,6 @@ abstract class DartDevelopmentService {
ipv6,
devToolsConfiguration,
logRequests,
enableServicePortFallback,
);
await service.startService();
return service;

29
pkg/dds/lib/src/dds_impl.dart
View file

@ -59,7 +59,6 @@ class DartDevelopmentServiceImpl implements DartDevelopmentService {
this._ipv6,
this._devToolsConfiguration,
this.shouldLogRequests,
this._enableServicePortFallback,
) {
_clientManager = ClientManager(this);
_expressionEvaluator = ExpressionEvaluator(this);
@ -137,7 +136,7 @@ class DartDevelopmentServiceImpl implements DartDevelopmentService {
final host = uri?.host ??
(_ipv6 ? InternetAddress.loopbackIPv6 : InternetAddress.loopbackIPv4)
.host;
var port = uri?.port ?? 0;
final port = uri?.port ?? 0;
var pipeline = const Pipeline();
if (shouldLogRequests) {
pipeline = pipeline.addMiddleware(
@ -156,25 +155,16 @@ class DartDevelopmentServiceImpl implements DartDevelopmentService {
late String errorMessage;
final tmpServer = await runZonedGuarded(
() async {
Future<HttpServer?> startServer() async {
try {
return await io.serve(handler, host, port);
} on SocketException catch (e) {
if (_enableServicePortFallback && port != 0) {
// Try again, this time with a random port.
port = 0;
return await startServer();
}
errorMessage = e.message;
if (e.osError != null) {
errorMessage += ' (${e.osError!.message})';
}
errorMessage += ': ${e.address?.host}:${e.port}';
return null;
try {
return await io.serve(handler, host, port);
} on SocketException catch (e) {
errorMessage = e.message;
if (e.osError != null) {
errorMessage += ' (${e.osError!.message})';
}
errorMessage += ': ${e.address?.host}:${e.port}';
return null;
}
return await startServer();
},
(error, stack) {
if (shouldLogRequests) {
@ -397,7 +387,6 @@ class DartDevelopmentServiceImpl implements DartDevelopmentService {
String? get authCode => _authCode;
String? _authCode;
final bool _enableServicePortFallback;
final bool shouldLogRequests;
Uri get remoteVmServiceUri => _remoteVmServiceUri;

4
runtime/bin/main_options.cc
View file

@ -666,10 +666,6 @@ bool Options::ParseArguments(int argc,
if (implicitly_use_dart_dev && Options::vm_service_auth_disabled()) {
dart_options->AddArgument("--disable-service-auth-codes");
}
if (implicitly_use_dart_dev &&
Options::enable_service_port_fallback()) {
dart_options->AddArgument("--enable-service-port-fallback");
}
}
first_option = false;
}

1
sdk/lib/_internal/vm/bin/vmservice_io.dart
View file

@ -103,7 +103,6 @@ class _DebuggingSession {
enableDevTools.toString(),
devToolsBinaries,
enableLogging.toString(),
_enableServicePortFallback.toString(),
],
mode: ProcessStartMode.detachedWithStdio,
);

40
sdk/lib/_internal/vm/bin/vmservice_server.dart
View file

@ -409,8 +409,11 @@ class Server {
// Already running.
return this;
}
// Startup HTTP server.
Future<void> startServer() async {
var pollError;
var pollStack;
Future<bool> poll() async {
try {
var address;
var addresses = await InternetAddress.lookup(_ip);
@ -420,22 +423,33 @@ class Server {
if (address.type == InternetAddressType.IPv4) break;
}
_server = await HttpServer.bind(address, _port);
return true;
} catch (e, st) {
if (_port != 0 && _enableServicePortFallback) {
serverPrint('Failed to bind Observatory HTTP server to port $_port. '
'Falling back to automatic port selection');
_port = 0;
await startServer();
} else {
serverPrint('Could not start Observatory HTTP server:\n'
'$e\n$st');
_notifyServerState('');
onServerAddressChange(null);
}
pollError = e;
pollStack = st;
return false;
}
}
await startServer();
// poll for the network for ~10 seconds.
int attempts = 0;
final maxAttempts = 10;
while (!await poll()) {
attempts++;
serverPrint('Observatory server failed to start after $attempts tries');
if (attempts > maxAttempts) {
serverPrint('Could not start Observatory HTTP server:\n'
'$pollError\n$pollStack\n');
_notifyServerState('');
onServerAddressChange(null);
return this;
}
if (_port != 0 && _enableServicePortFallback && attempts >= 3) {
_port = 0;
serverPrint('Falling back to automatic port selection');
}
await Future<void>.delayed(const Duration(seconds: 1));
}
if (_service.isExiting) {
serverPrint('Observatory HTTP server exiting before listening as '
'vm service has received exit request\n');