You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mj...@apache.org on 2017/02/02 15:41:54 UTC
[1/3] accumulo git commit: Squashed commit of the following:
Repository: accumulo
Updated Branches:
refs/heads/master e62b5066c -> 00b15356e
Squashed commit of the following:
commit b6d788398464b7661f0daf9d43bb2e5202f966d8
Author: Luis Tavarez <ze...@outlook.com>
Date: Mon Jan 30 11:04:54 2017 -0500
ACCUMULO-4446 Commiting to run Jenkins
commit 42b0a133e49f3583e7a2e0324f2792f745acf910
Merge: e76b11f 42abc6b
Author: Luis Tavarez <ze...@outlook.com>
Date: Mon Jan 30 08:25:44 2017 -0500
Merge branch 'ACCCUMULO-4446-1.7' of github.com:lstav/accumulo into ACCCUMULO-4446-1.7
commit e76b11f00d34e2c52afb19f75821296b37379ae2
Author: Luis Tavarez <ze...@outlook.com>
Date: Mon Jan 30 08:25:18 2017 -0500
ACCUMULO-4446 Changed format of log messages
commit 42abc6b4ec8f720eefb1b7c2d43e5aee643f6ff3
Merge: 43b196f 23b7969
Author: Luis Tavarez <ze...@outlook.com>
Date: Thu Jan 26 18:07:21 2017 -0500
Merge branch 'ACCCUMULO-4448-1.7' of github.com:lstav/accumulo into ACCCUMULO-4446-1.7
commit 43b196fbd93f7b1d0fae4a0ccca57d9a98be7491
Author: Luis Tavarez <ze...@outlook.com>
Date: Thu Jan 26 09:35:40 2017 -0500
ACCUMULO-4446 Added log messages when acquiring Master, Monitor, ZK, and GC locks
commit 23b7969a8ecf557ab5653fdc8f5075ddf251b157
Author: Luis Tavarez <ze...@outlook.com>
Date: Thu Jan 26 09:35:40 2017 -0500
ACCUMULO-4446 Making changes to 1.7
Signed-off-by: Michael Wall <mj...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/33712bb7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33712bb7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33712bb7
Branch: refs/heads/master
Commit: 33712bb783b4f058793953f71a9ff7100e25d89b
Parents: 5f664cd
Author: Michael Wall <mj...@apache.org>
Authored: Thu Feb 2 10:38:17 2017 -0500
Committer: Michael Wall <mj...@apache.org>
Committed: Thu Feb 2 10:38:17 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 7 +++----
.../src/main/java/org/apache/accumulo/master/Master.java | 4 ++--
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 4 ++--
.../main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++--
4 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/33712bb7/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 7f4af83..513a9d6 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -511,8 +511,6 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa
// Sleep for an initial period, giving the master time to start up and
// old data files to be unused
- log.info("Trying to acquire ZooKeeper lock for garbage collector");
-
try {
getZooLock(startStatsService());
} catch (Exception ex) {
@@ -683,6 +681,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa
}
private void getZooLock(HostAndPort addr) throws KeeperException, InterruptedException {
+ log.info("Attempting to acquire Garbage Collector Lock");
String path = ZooUtil.getRoot(getInstance()) + Constants.ZGC_LOCK;
LockWatcher lockWatcher = new LockWatcher() {
@@ -708,10 +707,10 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa
while (true) {
lock = new ZooLock(path);
if (lock.tryLock(lockWatcher, new ServerServices(addr.toString(), Service.GC_CLIENT).toString().getBytes())) {
- log.debug("Got GC ZooKeeper lock");
+ log.info("Acquired Garbage Collector Lock");
return;
}
- log.debug("Failed to get GC ZooKeeper lock, will retry");
+ log.debug("Failed to acquire GC ZooKeeper lock, will retry");
UtilWaitThread.sleep(1000);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/33712bb7/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 6089de9..2e13be4 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -1315,7 +1315,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
}
private void getMasterLock(final String zMasterLoc) throws KeeperException, InterruptedException {
- log.info("trying to get master lock");
+ log.info("Attempting to acquire Master Lock");
final String masterClientAddress = hostname + ":" + getConfiguration().getPort(Property.MASTER_CLIENTPORT);
@@ -1339,7 +1339,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
UtilWaitThread.sleep(TIME_TO_WAIT_BETWEEN_LOCK_CHECKS);
}
-
+ log.info("Acquired Master Lock");
setMasterState(MasterState.HAVE_LOCK);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/33712bb7/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index f99d5d5..be49002 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -621,6 +621,7 @@ public class Monitor {
}
}
+ log.info("Attempting to acquire Monitor Lock");
// Get a ZooLock for the monitor
while (true) {
MoniterLockWatcher monitorLockWatcher = new MoniterLockWatcher();
@@ -641,8 +642,7 @@ public class Monitor {
UtilWaitThread.sleep(getContext().getConfiguration().getTimeInMillis(Property.MONITOR_LOCK_CHECK_INTERVAL));
}
-
- log.info("Got Monitor lock.");
+ log.info("Acquired Monitor Lock {}", monitorLock.getLockPath());
}
/**
http://git-wip-us.apache.org/repos/asf/accumulo/blob/33712bb7/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 0554462..acbb513 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -2383,12 +2383,12 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
for (int i = 0; i < 120 / 5; i++) {
zoo.putPersistentData(zPath, new byte[0], NodeExistsPolicy.SKIP);
+ log.info("Attempting to acquire Tablet Server Lock");
if (tabletServerLock.tryLock(lw, lockContent)) {
- log.debug("Obtained tablet server lock " + tabletServerLock.getLockPath());
+ log.info("Acquired Tablet Server Lock {}", tabletServerLock.getLockPath());
lockID = tabletServerLock.getLockID().serialize(ZooUtil.getRoot(getInstance()) + Constants.ZTSERVERS + "/");
return;
}
- log.info("Waiting for tablet server lock");
UtilWaitThread.sleep(5000);
}
String msg = "Too many retries, exiting.";
[2/3] accumulo git commit: Merge branch '1.7' into 1.8
Posted by mj...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4ac4b9d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4ac4b9d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a4ac4b9d
Branch: refs/heads/master
Commit: a4ac4b9d415b8a7bb6dc36788c3a4d461d15b935
Parents: 09fcd14 33712bb
Author: Michael Wall <mj...@apache.org>
Authored: Thu Feb 2 10:39:52 2017 -0500
Committer: Michael Wall <mj...@apache.org>
Committed: Thu Feb 2 10:39:52 2017 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/3] accumulo git commit: Merge branch '1.8'
Posted by mj...@apache.org.
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00b15356
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00b15356
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/00b15356
Branch: refs/heads/master
Commit: 00b15356e6d1b8afd2a7be25962fdc5e9d22dbb6
Parents: e62b506 a4ac4b9
Author: Michael Wall <mj...@apache.org>
Authored: Thu Feb 2 10:41:31 2017 -0500
Committer: Michael Wall <mj...@apache.org>
Committed: Thu Feb 2 10:41:31 2017 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------