|
|
@ -282,7 +282,7 @@ class XdsTestClient(framework.rpc.grpc.GrpcApp): |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
logger.info( |
|
|
|
logger.info( |
|
|
|
"[%s] ADS: Waiting for successful calls to xDS control plane to %s", |
|
|
|
"[%s] ADS: Waiting for active calls to xDS control plane to %s", |
|
|
|
self.hostname, |
|
|
|
self.hostname, |
|
|
|
xds_server_uri, |
|
|
|
xds_server_uri, |
|
|
|
) |
|
|
|
) |
|
|
@ -292,7 +292,7 @@ class XdsTestClient(framework.rpc.grpc.GrpcApp): |
|
|
|
rpc_deadline=rpc_deadline, |
|
|
|
rpc_deadline=rpc_deadline, |
|
|
|
) |
|
|
|
) |
|
|
|
logger.info( |
|
|
|
logger.info( |
|
|
|
"[%s] ADS: Detected successful calls to xDS control plane %s", |
|
|
|
"[%s] ADS: Detected active calls to xDS control plane %s", |
|
|
|
self.hostname, |
|
|
|
self.hostname, |
|
|
|
xds_server_uri, |
|
|
|
xds_server_uri, |
|
|
|
) |
|
|
|
) |
|
|
@ -320,11 +320,11 @@ class XdsTestClient(framework.rpc.grpc.GrpcApp): |
|
|
|
channel, **rpc_params |
|
|
|
channel, **rpc_params |
|
|
|
) |
|
|
|
) |
|
|
|
logger.info( |
|
|
|
logger.info( |
|
|
|
"[%s] Detected successful calls to xDS control plane %s," |
|
|
|
"[%s] Detected active calls to xDS control plane %s," |
|
|
|
" channel: %s", |
|
|
|
" channel: %s", |
|
|
|
self.hostname, |
|
|
|
self.hostname, |
|
|
|
xds_server_uri, |
|
|
|
xds_server_uri, |
|
|
|
_ChannelzServiceClient.channel_repr(channel), |
|
|
|
_ChannelzServiceClient.channel_repr(channel_upd), |
|
|
|
) |
|
|
|
) |
|
|
|
return channel_upd |
|
|
|
return channel_upd |
|
|
|
except self.NotFound: |
|
|
|
except self.NotFound: |
|
|
@ -332,9 +332,15 @@ class XdsTestClient(framework.rpc.grpc.GrpcApp): |
|
|
|
# not found. |
|
|
|
# not found. |
|
|
|
continue |
|
|
|
continue |
|
|
|
except framework.rpc.grpc.RpcError as err: |
|
|
|
except framework.rpc.grpc.RpcError as err: |
|
|
|
logger.debug( |
|
|
|
# Logged at 'info' and not at 'warning' because this method is |
|
|
|
f"Unexpected error while checking" |
|
|
|
# expected to be called in a retryer. If this error eventually |
|
|
|
f" channel {channel.ref.channel_id}: {err}" |
|
|
|
# causes the retryer to fail, it will be logged fully at 'error' |
|
|
|
|
|
|
|
logger.info( |
|
|
|
|
|
|
|
"[%s] Unexpected error while checking xDS control plane" |
|
|
|
|
|
|
|
" channel %s: %r", |
|
|
|
|
|
|
|
self.hostname, |
|
|
|
|
|
|
|
_ChannelzServiceClient.channel_repr(channel), |
|
|
|
|
|
|
|
err, |
|
|
|
) |
|
|
|
) |
|
|
|
raise |
|
|
|
raise |
|
|
|
|
|
|
|
|
|
|
|