Merge pull request #1226 from Telefonica/improve-logging

Improve logging in leader election

Author: k8s-ci-robot

extended/src/main/java/io/kubernetes/client/extended/leaderelection/LeaderElector.java

@@ -173,7 +173,7 @@ private boolean acquire() {
         Thread.sleep(retryPeriodMillis);
       }
     } catch (InterruptedException e) {
-      log.error("LeaderElection acquire loop gets interrupted {}", e.getMessage());
+      log.error("LeaderElection acquire loop gets interrupted", e);
       return false;
     } finally {
       scheduledFuture.cancel(true);
@@ -228,7 +228,7 @@ private void renewLoop() {
         }
       }
     } catch (InterruptedException e) {
-      log.error("LeaderElection renew loop gets interrupted {}", e.getMessage());
+      log.error("LeaderElection renew loop gets interrupted", e);
     }
   }
 
@@ -249,7 +249,7 @@ private boolean tryAcquireOrRenew() {
       oldLeaderElectionRecord = lock.get();
     } catch (ApiException e) {
       if (e.getCode() != HttpURLConnection.HTTP_NOT_FOUND) {
-        log.error("Error retrieving resource lock {} as {}", lock.describe(), e.getMessage());
+        log.error("Error retrieving resource lock {}", lock.describe(), e);
         return false;
       }
 

extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLock.java

@@ -20,6 +20,7 @@
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import java.net.HttpURLConnection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
@@ -93,8 +94,12 @@ public boolean create(LeaderElectionRecord record) {
           coreV1Client.createNamespacedConfigMap(namespace, configMap, null, null, null);
       configMapRefer.set(createdConfigMap);
       return true;
-    } catch (Throwable t) {
-      log.error("failed to create leader election record as {}", t.getMessage());
+    } catch (ApiException e) {
+      if (e.getCode() == HttpURLConnection.HTTP_CONFLICT) {
+        log.debug("received {} when creating configmap lock", e.getCode(), e);
+      } else {
+        log.error("received {} when creating configmap lock", e.getCode(), e);
+      }
       return false;
     }
   }
@@ -113,8 +118,12 @@ public boolean update(LeaderElectionRecord record) {
           coreV1Client.replaceNamespacedConfigMap(name, namespace, configMap, null, null, null);
       configMapRefer.set(replacedConfigMap);
       return true;
-    } catch (Throwable t) {
-      log.error("failed to update leader election record as {}", t.getMessage());
+    } catch (ApiException e) {
+      if (e.getCode() == HttpURLConnection.HTTP_CONFLICT) {
+        log.debug("received {} when updating configmap lock", e.getCode(), e);
+      } else {
+        log.error("received {} when updating configmap lock", e.getCode(), e);
+      }
       return false;
     }
   }

extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/EndpointsLock.java

@@ -20,6 +20,7 @@
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import java.net.HttpURLConnection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
@@ -93,8 +94,12 @@ public boolean create(LeaderElectionRecord record) {
           coreV1Client.createNamespacedEndpoints(namespace, endpoints, null, null, null);
       endpointsRefer.set(createdendpoints);
       return true;
-    } catch (Throwable t) {
-      log.error("failed to create leader election record as {}", t.getMessage());
+    } catch (ApiException e) {
+      if (e.getCode() == HttpURLConnection.HTTP_CONFLICT) {
+        log.debug("received {} when creating endpoints lock", e.getCode(), e);
+      } else {
+        log.error("received {} when creating endpoints lock", e.getCode(), e);
+      }
       return false;
     }
   }
@@ -113,8 +118,12 @@ public boolean update(LeaderElectionRecord record) {
           coreV1Client.replaceNamespacedEndpoints(name, namespace, endpoints, null, null, null);
       endpointsRefer.set(replacedEndpoints);
       return true;
-    } catch (Throwable t) {
-      log.error("failed to update leader election record as {}", t.getMessage());
+    } catch (ApiException e) {
+      if (e.getCode() == HttpURLConnection.HTTP_CONFLICT) {
+        log.debug("received {} when updating endpoints lock", e.getCode(), e);
+      } else {
+        log.error("received {} when updating endpoints lock", e.getCode(), e);
+      }
       return false;
     }
   }