You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by jb...@apache.org on 2018/01/05 20:37:25 UTC
incubator-gobblin git commit: [GOBBLIN-357] Fix logging during
Zookeeper connection loss
Repository: incubator-gobblin
Updated Branches:
refs/heads/master 58a6f2ae7 -> 5043c537c
[GOBBLIN-357] Fix logging during Zookeeper connection loss
Fix log messages when the zookeeper connection is
lost which were not being formatted correctly.
Add start & end log messages to job cancellation.
Closes #2230 from kadaan/GOBBLIN-357__Fix_poor_log
ging_when_zookeeper_connection_is_lost
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/5043c537
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/5043c537
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/5043c537
Branch: refs/heads/master
Commit: 5043c537c5702b97b3dd1f82da9d2665618a6bd1
Parents: 58a6f2a
Author: Joel Baranick <jb...@apache.org>
Authored: Fri Jan 5 12:32:57 2018 -0800
Committer: Joel Baranick <jo...@ensighten.com>
Committed: Fri Jan 5 12:33:16 2018 -0800
----------------------------------------------------------------------
.../org/apache/gobblin/cluster/GobblinHelixJobLauncher.java | 4 +++-
.../apache/gobblin/runtime/locks/ZookeeperBasedJobLock.java | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/5043c537/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobLauncher.java
----------------------------------------------------------------------
diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobLauncher.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobLauncher.java
index 74d7169..fb8b579 100644
--- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobLauncher.java
+++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobLauncher.java
@@ -236,10 +236,12 @@ public class GobblinHelixJobLauncher extends AbstractJobLauncher {
try {
// #HELIX-0.6.7-WORKAROUND
// working around helix 0.6.7 job delete issue with custom taskDriver
+ LOGGER.info("Cancelling job {} in Helix", this.jobContext.getJobId());
GobblinHelixTaskDriver taskDriver = new GobblinHelixTaskDriver(this.helixManager);
taskDriver.deleteJob(this.helixQueueName, this.jobContext.getJobId());
+ LOGGER.info("Job {} in cancelled Helix", this.jobContext.getJobId());
} catch (IllegalArgumentException e) {
- LOGGER.warn(String.format("Failed to cleanup job %s in Helix", this.jobContext.getJobId()), e);
+ LOGGER.warn("Failed to cancel job {} in Helix", this.jobContext.getJobId(), e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/5043c537/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/locks/ZookeeperBasedJobLock.java
----------------------------------------------------------------------
diff --git a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/locks/ZookeeperBasedJobLock.java b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/locks/ZookeeperBasedJobLock.java
index 75fcd08..0b585a8 100644
--- a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/locks/ZookeeperBasedJobLock.java
+++ b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/locks/ZookeeperBasedJobLock.java
@@ -187,15 +187,15 @@ public class ZookeeperBasedJobLock implements ListenableJobLock {
case LOST:
log.warn("Lost connection with zookeeper");
for (Map.Entry<String, JobLockEventListener> lockEventListener : lockEventListeners.entrySet()) {
- log.warn("Informing job %s that lock was lost", lockEventListener.getKey());
+ log.warn("Informing job {} that lock was lost", lockEventListener.getKey());
lockEventListener.getValue().onLost();
}
break;
case SUSPENDED:
- log.warn("Lost connection with zookeeper");
+ log.warn("Suspended connection with zookeeper");
for (Map.Entry<String, JobLockEventListener> lockEventListener : lockEventListeners.entrySet()) {
- log.warn("Informing job %s that lock was lost", lockEventListener.getKey());
- lockEventListener.getValue().onLost();
+ log.warn("Informing job {} that lock was suspended", lockEventListener.getKey());
+ lockEventListener.getValue().onLost();
}
break;
case CONNECTED: