From 6016c582a226b420993dad241579e2e93c3e062d Mon Sep 17 00:00:00 2001 From: Andrew Ash Date: Fri, 3 Mar 2017 14:43:36 -0800 Subject: [PATCH 1/2] Logging for resource deletion Remove dangling colon and replace with an ellipses and a second log statement --- .../spark/deploy/kubernetes/KubernetesResourceCleaner.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesResourceCleaner.scala b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesResourceCleaner.scala index 6360bc0e48948..0b5be2788c303 100644 --- a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesResourceCleaner.scala +++ b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesResourceCleaner.scala @@ -39,13 +39,14 @@ private[spark] class KubernetesResourceCleaner extends Logging { def deleteAllRegisteredResourcesFromKubernetes(kubernetesClient: KubernetesClient): Unit = { synchronized { - logInfo(s"Deleting ${resources.size} registered Kubernetes resources:") + logInfo(s"Deleting ${resources.size} registered Kubernetes resources...") resources.values.foreach { resource => Utils.tryLogNonFatalError { kubernetesClient.resource(resource).delete() } } resources.clear() + logInfo(s"Deleted ${resources.size} registered Kubernetes resources.") } } } From 304ec9504fc1dc416a6c33548f2fd37362845246 Mon Sep 17 00:00:00 2001 From: Andrew Ash Date: Fri, 3 Mar 2017 15:03:17 -0800 Subject: [PATCH 2/2] Update KubernetesResourceCleaner.scala --- .../spark/deploy/kubernetes/KubernetesResourceCleaner.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesResourceCleaner.scala b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesResourceCleaner.scala index 0b5be2788c303..6329bb1359516 100644 --- a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesResourceCleaner.scala +++ b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/KubernetesResourceCleaner.scala @@ -39,14 +39,15 @@ private[spark] class KubernetesResourceCleaner extends Logging { def deleteAllRegisteredResourcesFromKubernetes(kubernetesClient: KubernetesClient): Unit = { synchronized { - logInfo(s"Deleting ${resources.size} registered Kubernetes resources...") + val resourceCount = resources.size + logInfo(s"Deleting ${resourceCount} registered Kubernetes resources...") resources.values.foreach { resource => Utils.tryLogNonFatalError { kubernetesClient.resource(resource).delete() } } resources.clear() - logInfo(s"Deleted ${resources.size} registered Kubernetes resources.") + logInfo(s"Deleted ${resourceCount} registered Kubernetes resources.") } } }