Merge pull request #661 from yue9944882/bugfix/leaking-informer-controller-thread

k8s-ci-robot · web-flow · commit 774157f5f143 · 2019-08-20T08:18:57.000-07:00
Fixes leaking informer#controller daemon thread
diff --git a/util/src/main/java/io/kubernetes/client/informer/cache/Controller.java b/util/src/main/java/io/kubernetes/client/informer/cache/Controller.java
@@ -146,6 +146,9 @@ private void processLoop() {
         this.queue.pop(this.processFunc);
       } catch (InterruptedException t) {
         log.error("DefaultController#processLoop get interrupted {}", t.getMessage(), t);
+        return;
+      } catch (Throwable t) {
+        log.error("DefaultController#processLoop recovered from crashing {}", t.getMessage(), t);
       }
     }
   }
diff --git a/util/src/main/java/io/kubernetes/client/informer/impl/DefaultSharedIndexInformer.java b/util/src/main/java/io/kubernetes/client/informer/impl/DefaultSharedIndexInformer.java
@@ -76,7 +76,8 @@ public DefaultSharedIndexInformer(
             processor::shouldResync,
             resyncCheckPeriodMillis);
 
-    controllerThread = new Thread(controller::run);
+    controllerThread =
+        new Thread(controller::run, "informer-controller-" + apiTypeClass.getSimpleName());
   }
 
   /** add event callback */

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,9 @@ private void processLoop() {`
`146`	`146`	`this.queue.pop(this.processFunc);`
`147`	`147`	`} catch (InterruptedException t) {`
`148`	`148`	`log.error("DefaultController#processLoop get interrupted {}", t.getMessage(), t);`
	`149`	`+ return;`
	`150`	`+ } catch (Throwable t) {`
	`151`	`+ log.error("DefaultController#processLoop recovered from crashing {}", t.getMessage(), t);`
`149`	`152`	`}`
`150`	`153`	`}`
`151`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ public DefaultSharedIndexInformer(`
`76`	`76`	`processor::shouldResync,`
`77`	`77`	`resyncCheckPeriodMillis);`
`78`	`78`
`79`		`- controllerThread = new Thread(controller::run);`
	`79`	`+ controllerThread =`
	`80`	`+ new Thread(controller::run, "informer-controller-" + apiTypeClass.getSimpleName());`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`/** add event callback */`