Skip to content

Commit

Permalink
[PSM Interop] Log on debug level when resource deletion failure is 404
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergiitk
sergiitk committed Nov 28, 2023
1 parent 79c9a67 commit f6629e5
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 27 deletions.
1 change: 1 addition & 0 deletions tools/run_tests/xds_k8s_test_driver/bin/run_ping_pong.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def get_client_rpc_stats(


def run_ping_pong(test_client: _XdsTestClient, num_rpcs: int):
test_client.wait_for_active_xds_channel()
test_client.wait_for_server_channel_ready()
lb_stats = get_client_rpc_stats(test_client, num_rpcs)
for backend, rpcs_count in lb_stats.rpcs_by_peer.items():
Expand Down
2 changes: 1 addition & 1 deletion tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ def _delete_resource(
return True
except _HttpError as error:
if error.resp and error.resp.status == 404:
logger.info("%s not deleted since it does not exist", full_name)
logger.debug("%s not deleted since it doesn't exist", full_name)
else:
logger.warning("Failed to delete %s, %r", full_name, error)
return False
Expand Down
4 changes: 2 additions & 2 deletions tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/compute.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,8 @@ def _delete_resource(
return True
except googleapiclient.errors.HttpError as error:
if error.resp and error.resp.status == 404:
logger.info(
'Resource %s "%s" not deleted since it does not exist',
logger.debug(
"Resource %s %s not deleted since it doesn't exist",
resource_type,
resource_name,
)
Expand Down
91 changes: 67 additions & 24 deletions tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,20 +582,32 @@ def _delete_gamma_route(self, name, wait_for_deletion=True):
logger.info("Deleting HTTPRoute %s", name)
try:
self.k8s_namespace.delete_gamma_route(name)
except (retryers.RetryError, k8s.NotFound) as e:
logger.info("HTTPRoute %s deletion failed: %s", name, e)
except k8s.NotFound:
logger.debug(
"HTTPRoute %s not deleted since it doesn't exist", name
)
return
except retryers.RetryError as e:
logger.warning("HTTPRoute %s deletion failed: %s", name, e)
return

if wait_for_deletion:
self.k8s_namespace.wait_for_get_gamma_route_deleted(name)
logger.debug("HTTPRoute %s deleted", name)
logger.info("HTTPRoute %s deleted", name)

def _delete_session_affinity_policy(self, name, wait_for_deletion=True):
logger.info("Deleting GCPSessionAffinityPolicy %s", name)
try:
self.k8s_namespace.delete_session_affinity_policy(name)
except (retryers.RetryError, k8s.NotFound) as e:
logger.info(
except k8s.NotFound:
logger.debug(
"GCPSessionAffinityPolicy %s not deleted since it"
" doesn't exist",
name,
)
return
except retryers.RetryError as e:
logger.warning(
"GCPSessionAffinityPolicy %s deletion failed: %s", name, e
)
return
Expand All @@ -604,14 +616,21 @@ def _delete_session_affinity_policy(self, name, wait_for_deletion=True):
self.k8s_namespace.wait_for_get_session_affinity_policy_deleted(
name
)
logger.debug("GCPSessionAffinityPolicy %s deleted", name)
logger.info("GCPSessionAffinityPolicy %s deleted", name)

def _delete_session_affinity_filter(self, name, wait_for_deletion=True):
logger.info("Deleting GCPSessionAffinityFilter %s", name)
try:
self.k8s_namespace.delete_session_affinity_filter(name)
except (retryers.RetryError, k8s.NotFound) as e:
logger.info(
except k8s.NotFound:
logger.debug(
"GCPSessionAffinityFilter %s not deleted since it"
" doesn't exist",
name,
)
return
except retryers.RetryError as e:
logger.warning(
"GCPSessionAffinityFilter %s deletion failed: %s", name, e
)
return
Expand All @@ -620,71 +639,95 @@ def _delete_session_affinity_filter(self, name, wait_for_deletion=True):
self.k8s_namespace.wait_for_get_session_affinity_filter_deleted(
name
)
logger.debug("GCPSessionAffinityFilter %s deleted", name)
logger.info("GCPSessionAffinityFilter %s deleted", name)

def _delete_backend_policy(self, name, wait_for_deletion=True):
logger.info("Deleting GCPBackendPolicy %s", name)
try:
self.k8s_namespace.delete_backend_policy(name)
except (retryers.RetryError, k8s.NotFound) as e:
logger.info("GGCPBackendPolicy %s deletion failed: %s", name, e)
except k8s.NotFound:
logger.debug(
"GGCPBackendPolicy %s not deleted since it doesn't exist", name
)
return
except retryers.RetryError as e:
logger.warning("GGCPBackendPolicy %s deletion failed: %s", name, e)
return

if wait_for_deletion:
self.k8s_namespace.wait_for_get_backend_policy_deleted(name)
logger.debug("GCPBackendPolicy %s deleted", name)
logger.info("GCPBackendPolicy %s deleted", name)

def _delete_deployment(self, name, wait_for_deletion=True):
logger.info("Deleting deployment %s", name)
self.stop_pod_dependencies()
try:
self.k8s_namespace.delete_deployment(name)
except (retryers.RetryError, k8s.NotFound) as e:
logger.info("Deployment %s deletion failed: %s", name, e)
except k8s.NotFound:
logger.debug(
"Deployment %s not deleted since it doesn't exist", name
)
return
except retryers.RetryError as e:
logger.warning("Deployment %s deletion failed: %s", name, e)
return

if wait_for_deletion:
self.k8s_namespace.wait_for_deployment_deleted(name)
logger.debug("Deployment %s deleted", name)
logger.info("Deployment %s deleted", name)

def _delete_service(self, name, wait_for_deletion=True):
logger.info("Deleting service %s", name)
try:
self.k8s_namespace.delete_service(name)
except (retryers.RetryError, k8s.NotFound) as e:
logger.info("Service %s deletion failed: %s", name, e)
except k8s.NotFound:
logger.debug("Service %s not deleted since it doesn't exist", name)
return
except retryers.RetryError as e:
logger.warning("Service %s deletion failed: %s", name, e)
return

if wait_for_deletion:
self.k8s_namespace.wait_for_service_deleted(name)

logger.debug("Service %s deleted", name)
logger.info("Service %s deleted", name)

def _delete_service_account(self, name, wait_for_deletion=True):
logger.info("Deleting service account %s", name)
try:
self.k8s_namespace.delete_service_account(name)
except (retryers.RetryError, k8s.NotFound) as e:
logger.info("Service account %s deletion failed: %s", name, e)
except k8s.NotFound:
logger.debug(
"Service account %s not deleted since it doesn't exist", name
)
return
except retryers.RetryError as e:
logger.warning("Service account %s deletion failed: %s", name, e)
return

if wait_for_deletion:
self.k8s_namespace.wait_for_service_account_deleted(name)
logger.debug("Service account %s deleted", name)
logger.info("Service account %s deleted", name)

def delete_namespace(self, wait_for_deletion=True):
logger.info("Deleting namespace %s", self.k8s_namespace.name)
try:
self.k8s_namespace.delete()
except (retryers.RetryError, k8s.NotFound) as e:
logger.info(
except k8s.NotFound:
logger.debug(
"Namespace %s not deleted since it doesn't exist",
self.k8s_namespace.name,
)
return
except retryers.RetryError as e:
logger.warning(
"Namespace %s deletion failed: %s", self.k8s_namespace.name, e
)
return

if wait_for_deletion:
self.k8s_namespace.wait_for_namespace_deleted()
logger.debug("Namespace %s deleted", self.k8s_namespace.name)
logger.info("Namespace %s deleted", self.k8s_namespace.name)

def _wait_deployment_with_available_replicas(self, name, count=1, **kwargs):
logger.info(
Expand Down

0 comments on commit f6629e5

Please sign in to comment.