Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix lint, formatting.

Browse Source
pull/24704/head
Chengyuan Zhang 5 years ago
parent 07ddf4eaef
commit 16d6b8044f
1 changed files with 44 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 103
      tools/run_tests/run_xds_tests.py

103
tools/run_tests/run_xds_tests.py
Unescape View File

@ -328,12 +328,10 @@ def get_client_accumulated_stats():
request = messages_pb2.LoadBalancerAccumulatedStatsRequest() request = messages_pb2.LoadBalancerAccumulatedStatsRequest()
logger.debug('Invoking GetClientAccumulatedStats RPC to %s:%d:', logger.debug('Invoking GetClientAccumulatedStats RPC to %s:%d:',
host, args.stats_port) host, args.stats_port)
response = stub.GetClientAccumulatedStats(request, response = stub.GetClientAccumulatedStats(
wait_for_ready=True, request, wait_for_ready=True, timeout=_CONNECTION_TIMEOUT_SEC)
timeout=_CONNECTION_TIMEOUT_SEC)
logger.debug('Invoked GetClientAccumulatedStats RPC to %s: %s', logger.debug('Invoked GetClientAccumulatedStats RPC to %s: %s',
host, host, response)
response)
return response return response
@ -353,14 +351,14 @@ def configure_client(rpc_types, metadata):
md.type = rpc_type md.type = rpc_type
md.key = md_key md.key = md_key
md.value = md_value md.value = md_value
logger.debug('Invoking XdsUpdateClientConfigureService RPC to %s:%d: %s', logger.debug(
host, 'Invoking XdsUpdateClientConfigureService RPC to %s:%d: %s',
args.stats_port, host, args.stats_port, request)
request)
stub.Configure(request, stub.Configure(request,
wait_for_ready=True, wait_for_ready=True,
timeout=_CONNECTION_TIMEOUT_SEC) timeout=_CONNECTION_TIMEOUT_SEC)
logger.debug('Invoked XdsUpdateClientConfigureService RPC to %s', host) logger.debug('Invoked XdsUpdateClientConfigureService RPC to %s',
host)
class RpcDistributionError(Exception): class RpcDistributionError(Exception):
@ -426,12 +424,11 @@ def wait_until_rpcs_in_flight(rpc_type, timeout_sec, num_rpcs, threshold):
threshold_fraction = threshold / 100.0 threshold_fraction = threshold / 100.0
start_time = time.time() start_time = time.time()
error_msg = None error_msg = None
logger.debug('Waiting for %d sec until %d %s RPCs (with %d%% tolerance) in-flight' logger.debug(
% (timeout_sec, num_rpcs, rpc_type, threshold)) 'Waiting for %d sec until %d %s RPCs (with %d%% tolerance) in-flight' %
(timeout_sec, num_rpcs, rpc_type, threshold))
while time.time() - start_time <= timeout_sec: while time.time() - start_time <= timeout_sec:
error_msg = _check_rpcs_in_flight(rpc_type, error_msg = _check_rpcs_in_flight(rpc_type, num_rpcs, threshold,
num_rpcs,
threshold,
threshold_fraction) threshold_fraction)
if error_msg: if error_msg:
time.sleep(2) time.sleep(2)
@ -440,13 +437,11 @@ def wait_until_rpcs_in_flight(rpc_type, timeout_sec, num_rpcs, threshold):
# Ensure the number of outstanding RPCs is stable. # Ensure the number of outstanding RPCs is stable.
if not error_msg: if not error_msg:
time.sleep(5) time.sleep(5)
error_msg = _check_rpcs_in_flight(rpc_type, error_msg = _check_rpcs_in_flight(rpc_type, num_rpcs, threshold,
num_rpcs,
threshold,
threshold_fraction) threshold_fraction)
if error_msg: if error_msg:
raise Exception("Wrong number of %s RPCs in-flight: %s" raise Exception("Wrong number of %s RPCs in-flight: %s" %
% (rpc_type, error_msg)) (rpc_type, error_msg))
def _check_rpcs_in_flight(rpc_type, num_rpcs, threshold, threshold_fraction): def _check_rpcs_in_flight(rpc_type, num_rpcs, threshold, threshold_fraction):
@ -1082,41 +1077,35 @@ def test_header_matching(gcp, original_backend_service, instance_group,
patch_backend_service(gcp, alternate_backend_service, []) patch_backend_service(gcp, alternate_backend_service, [])
def test_circuit_breaking(gcp, def test_circuit_breaking(gcp, original_backend_service, instance_group,
original_backend_service, alternate_backend_service, same_zone_instance_group):
instance_group,
alternate_backend_service,
same_zone_instance_group):
logger.info('Running test_circuit_breaking') logger.info('Running test_circuit_breaking')
# The config validation for proxyless doesn't allow setting # The config validation for proxyless doesn't allow setting
# circuit_breakers. Disable validate validate_for_proxyless # circuit_breakers. Disable validate validate_for_proxyless
# for this test. This can be removed when validation # for this test. This can be removed when validation
# accepts circuit_breakers. # accepts circuit_breakers.
logger.info('disabling validate_for_proxyless in target proxy') logger.info('disabling validate_for_proxyless in target proxy')
set_validate_for_proxyless(gcp, False) set_validate_for_proxyless(gcp, False)
original_backend_service_max_requests = 500 original_backend_service_max_requests = 500
alternate_backend_service_max_requests = 1000 alternate_backend_service_max_requests = 1000
patch_backend_service(gcp, patch_backend_service(
original_backend_service, gcp,
[instance_group], original_backend_service, [instance_group],
circuit_breakers={ circuit_breakers={'maxRequests': original_backend_service_max_requests})
'maxRequests':
original_backend_service_max_requests
})
logger.info('Waiting for original backends to become healthy') logger.info('Waiting for original backends to become healthy')
wait_for_healthy_backends(gcp, original_backend_service, instance_group) wait_for_healthy_backends(gcp, original_backend_service, instance_group)
patch_backend_service(gcp, patch_backend_service(gcp,
alternate_backend_service, alternate_backend_service, [same_zone_instance_group],
[same_zone_instance_group],
circuit_breakers={ circuit_breakers={
'maxRequests': 'maxRequests':
alternate_backend_service_max_requests alternate_backend_service_max_requests
}) })
logger.info('Waiting for alternate to become healthy') logger.info('Waiting for alternate to become healthy')
wait_for_healthy_backends(gcp, alternate_backend_service, wait_for_healthy_backends(gcp, alternate_backend_service,
same_zone_instance_group) same_zone_instance_group)
original_backend_instances = get_instance_names(gcp, instance_group) original_backend_instances = get_instance_names(gcp, instance_group)
alternate_backend_instances = get_instance_names(gcp,same_zone_instance_group) alternate_backend_instances = get_instance_names(gcp,
same_zone_instance_group)
route_rules = [ route_rules = [
{ {
'priority': 0, 'priority': 0,
@ -1137,10 +1126,10 @@ def test_circuit_breaking(gcp,
] ]
try: try:
# Make client send UNARY_CALL and EMPTY_CALL. # Make client send UNARY_CALL and EMPTY_CALL.
configure_client( configure_client([
[messages_pb2.ClientConfigureRequest.RpcType.UNARY_CALL, messages_pb2.ClientConfigureRequest.RpcType.UNARY_CALL,
messages_pb2.ClientConfigureRequest.RpcType.EMPTY_CALL], messages_pb2.ClientConfigureRequest.RpcType.EMPTY_CALL
[]) ], [])
logger.info('Patching url map with %s', route_rules) logger.info('Patching url map with %s', route_rules)
patch_url_map_backend_service(gcp, patch_url_map_backend_service(gcp,
original_backend_service, original_backend_service,
@ -1151,40 +1140,37 @@ def test_circuit_breaking(gcp,
_WAIT_FOR_STATS_SEC) _WAIT_FOR_STATS_SEC)
# Make all calls keep-open. # Make all calls keep-open.
configure_client( configure_client([
[messages_pb2.ClientConfigureRequest.RpcType.UNARY_CALL, messages_pb2.ClientConfigureRequest.RpcType.UNARY_CALL,
messages_pb2.ClientConfigureRequest.RpcType.EMPTY_CALL], messages_pb2.ClientConfigureRequest.RpcType.EMPTY_CALL
[(messages_pb2.ClientConfigureRequest.RpcType.UNARY_CALL, ], [(messages_pb2.ClientConfigureRequest.RpcType.UNARY_CALL,
'rpc-behavior', 'keep-open'), 'rpc-behavior', 'keep-open'),
(messages_pb2.ClientConfigureRequest.RpcType.EMPTY_CALL, (messages_pb2.ClientConfigureRequest.RpcType.EMPTY_CALL,
'rpc-behavior', 'keep-open')]) 'rpc-behavior', 'keep-open')])
wait_until_rpcs_in_flight( wait_until_rpcs_in_flight(
'UNARY_CALL', 'UNARY_CALL',
(_WAIT_FOR_BACKEND_SEC + (_WAIT_FOR_BACKEND_SEC +
int(original_backend_service_max_requests / args.qps)), int(original_backend_service_max_requests / args.qps)),
original_backend_service_max_requests, original_backend_service_max_requests, 1)
1)
wait_until_rpcs_in_flight( wait_until_rpcs_in_flight(
'EMPTY_CALL', 'EMPTY_CALL',
(_WAIT_FOR_BACKEND_SEC + (_WAIT_FOR_BACKEND_SEC +
int(alternate_backend_service_max_requests / args.qps)), int(alternate_backend_service_max_requests / args.qps)),
alternate_backend_service_max_requests, alternate_backend_service_max_requests, 1)
1)
# Increment circuit breakers max_requests threshold. # Increment circuit breakers max_requests threshold.
original_backend_service_max_requests = 800 original_backend_service_max_requests = 800
patch_backend_service(gcp, patch_backend_service(gcp,
original_backend_service, original_backend_service, [instance_group],
[instance_group],
circuit_breakers={ circuit_breakers={
'maxRequests': 'maxRequests':
original_backend_service_max_requests}) original_backend_service_max_requests
})
wait_until_rpcs_in_flight( wait_until_rpcs_in_flight(
'UNARY_CALL', 'UNARY_CALL',
(_WAIT_FOR_BACKEND_SEC + (_WAIT_FOR_BACKEND_SEC +
int(original_backend_service_max_requests / args.qps)), int(original_backend_service_max_requests / args.qps)),
original_backend_service_max_requests, original_backend_service_max_requests, 1)
1)
finally: finally:
patch_url_map_backend_service(gcp, original_backend_service) patch_url_map_backend_service(gcp, original_backend_service)
patch_backend_service(gcp, original_backend_service, [instance_group]) patch_backend_service(gcp, original_backend_service, [instance_group])
@ -2103,8 +2089,7 @@ try:
alternate_backend_service, alternate_backend_service,
same_zone_instance_group) same_zone_instance_group)
elif test_case == 'circuit_breaking': elif test_case == 'circuit_breaking':
test_circuit_breaking(gcp, backend_service, test_circuit_breaking(gcp, backend_service, instance_group,
instance_group,
alternate_backend_service, alternate_backend_service,
same_zone_instance_group) same_zone_instance_group)
else: else:

Write Preview
Loading…
Cancel
Save