Fix invalid pointer when tfjob is deleted (#1285)

* Fix invalid pointer when tfjob is deleted * Removing unnecessary imports * Removing unnecessary imports
kubeflow · Jul 5, 2021 · eb362bd · eb362bd
1 parent 0c41b27
commit eb362bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/pkg/controller.v1/tensorflow/controller.go b/pkg/controller.v1/tensorflow/controller.go
@@ -248,7 +248,12 @@ func (tc *TFController) processNextWorkItem() bool {
 	if err != nil {
 		if err == errNotExists {
 			logger.Infof("TFJob has been deleted: %v", key)
-			tfJobsDeletedCount.WithLabelValues(tfJob.Namespace).Inc()
+			namespace, _, keyerr := cache.SplitMetaNamespaceKey(key)
+			if keyerr == nil && len(namespace) != 0 {
+				tfJobsDeletedCount.WithLabelValues(namespace).Inc()
+			} else {
+				logger.Errorf("Invalid TFJob key %s: Namespace is missing %v", key, keyerr)
+			}
 			return true
 		}
 

diff --git a/py/kubeflow/tf_operator/test_runner.py b/py/kubeflow/tf_operator/test_runner.py
@@ -9,7 +9,6 @@
 from importlib import import_module
 
 import retrying
-from google.cloud import storage  # pylint: disable=no-name-in-module
 from kubeflow.testing import test_util, util
 from kubeflow.tf_operator import util as tf_operator_util
 

diff --git a/py/kubeflow/tf_operator/util.py b/py/kubeflow/tf_operator/util.py
@@ -18,7 +18,7 @@
 import google.auth.transport.requests
 import requests
 import yaml
-from googleapiclient import errors
+#from googleapiclient import errors
 from kubeflow.testing import util
 from kubernetes import client as k8s_client
 from kubernetes.client import configuration as kubernetes_configuration