You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/05/26 17:53:06 UTC
[1/8] accumulo git commit: ACCUMULO-3837 shorten the time to fetch
the instance name and use a more reasonable default
Repository: accumulo
Updated Branches:
refs/heads/1.7 24ea8d141 -> 5320861a8
ACCUMULO-3837 shorten the time to fetch the instance name and use a more reasonable default
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2a167712
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2a167712
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2a167712
Branch: refs/heads/1.7
Commit: 2a167712690aa3957332c9503790e7936cbca90c
Parents: c4eff0c
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 10:23:54 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 10:23:54 2015 -0400
----------------------------------------------------------------------
.../apache/accumulo/monitor/servlets/BasicServlet.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2a167712/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index 7812603..ea63cf2 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@ -27,6 +27,7 @@ import java.net.URLEncoder;
import java.util.Date;
import java.util.List;
import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
@@ -48,7 +49,7 @@ abstract public class BasicServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
protected static final Logger log = Logger.getLogger(BasicServlet.class);
- static String cachedInstanceName = null;
+ static AtomicReference<String> cachedInstanceName = new AtomicReference<String>("(Unavailable)");
private static String bannerText;
private static String bannerColor;
private static String bannerBackground;
@@ -111,17 +112,17 @@ abstract public class BasicServlet extends HttpServlet {
}
synchronized (BasicServlet.class) {
// Learn our instance name asynchronously so we don't hang up if zookeeper is down
- if (cachedInstanceName == null) {
+ if (cachedInstanceName.get() == null) {
SimpleTimer.getInstance().schedule(new TimerTask() {
@Override
public void run() {
synchronized (BasicServlet.class) {
- if (cachedInstanceName == null) {
- cachedInstanceName = HdfsZooInstance.getInstance().getInstanceName();
+ if (cachedInstanceName.get() == null) {
+ cachedInstanceName.set(HdfsZooInstance.getInstance().getInstanceName());
}
}
}
- }, 1000);
+ }, 0);
}
}
@@ -173,7 +174,7 @@ abstract public class BasicServlet extends HttpServlet {
}
sb.append("<div id='headertitle'>");
sb.append("<h1>").append(getTitle(req)).append("</h1></div>\n");
- sb.append("<div id='subheader'>Instance Name: ").append(cachedInstanceName).append(" Version: ").append(Constants.VERSION)
+ sb.append("<div id='subheader'>Instance Name: ").append(cachedInstanceName.get()).append(" Version: ").append(Constants.VERSION)
.append("\n");
sb.append("<br><span class='smalltext'>Instance ID: ").append(HdfsZooInstance.getInstance().getInstanceID()).append("</span>\n");
sb.append("<br><span class='smalltext'>").append(new Date().toString().replace(" ", " ")).append("</span>");
[3/8] accumulo git commit: ACCUMULO-3837 fetch instance name with the
other data
Posted by ec...@apache.org.
ACCUMULO-3837 fetch instance name with the other data
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80a7bb18
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80a7bb18
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80a7bb18
Branch: refs/heads/1.7
Commit: 80a7bb182b57acc7d17215eb0e2da46d0d3350f0
Parents: 2a16771
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:08:59 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:08:59 2015 -0400
----------------------------------------------------------------------
core/.gitignore | 1 +
examples/simple/.gitignore | 1 +
fate/.gitignore | 1 +
maven-plugin/.gitignore | 1 +
.../org/apache/accumulo/monitor/Monitor.java | 22 ++++++++++++++++++++
.../accumulo/monitor/servlets/BasicServlet.java | 21 +------------------
server/tracer/.gitignore | 1 +
trace/.gitignore | 1 +
8 files changed, 29 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/80a7bb18/core/.gitignore
----------------------------------------------------------------------
diff --git a/core/.gitignore b/core/.gitignore
index 56204d2..59a826f 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -23,3 +23,4 @@
/.pydevproject
/.idea
/*.iml
+/bin/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/80a7bb18/examples/simple/.gitignore
----------------------------------------------------------------------
diff --git a/examples/simple/.gitignore b/examples/simple/.gitignore
index 56204d2..59a826f 100644
--- a/examples/simple/.gitignore
+++ b/examples/simple/.gitignore
@@ -23,3 +23,4 @@
/.pydevproject
/.idea
/*.iml
+/bin/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/80a7bb18/fate/.gitignore
----------------------------------------------------------------------
diff --git a/fate/.gitignore b/fate/.gitignore
index 56204d2..59a826f 100644
--- a/fate/.gitignore
+++ b/fate/.gitignore
@@ -23,3 +23,4 @@
/.pydevproject
/.idea
/*.iml
+/bin/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/80a7bb18/maven-plugin/.gitignore
----------------------------------------------------------------------
diff --git a/maven-plugin/.gitignore b/maven-plugin/.gitignore
index 56204d2..e7d7fb1 100644
--- a/maven-plugin/.gitignore
+++ b/maven-plugin/.gitignore
@@ -23,3 +23,4 @@
/.pydevproject
/.idea
/*.iml
+/target/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/80a7bb18/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 1b1e534..60f5772 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
@@ -29,7 +29,9 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.TimerTask;
import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicReference;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Connector;
@@ -56,6 +58,7 @@ import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
+import org.apache.accumulo.monitor.servlets.BasicServlet;
import org.apache.accumulo.monitor.servlets.DefaultServlet;
import org.apache.accumulo.monitor.servlets.GcStatusServlet;
import org.apache.accumulo.monitor.servlets.JSONServlet;
@@ -85,6 +88,7 @@ import org.apache.accumulo.server.security.SecurityUtil;
import org.apache.accumulo.server.security.SystemCredentials;
import org.apache.accumulo.server.util.Halt;
import org.apache.accumulo.server.util.TableInfoUtil;
+import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
import org.apache.accumulo.trace.instrument.Tracer;
@@ -167,6 +171,8 @@ public class Monitor {
private ZooLock monitorLock;
+ public static AtomicReference<String> cachedInstanceName = new AtomicReference<String>("(Unavailable)");
+
private static class EventCounter {
Map<String,Pair<Long,Long>> prevSamples = new HashMap<String,Pair<Long,Long>>();
@@ -242,6 +248,22 @@ public class Monitor {
return;
synchronized (Monitor.class) {
+ // Learn our instance name asynchronously so we don't hang up if zookeeper is down
+ if (Monitor.cachedInstanceName.get() == null) {
+ SimpleTimer.getInstance().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ synchronized (Monitor.class) {
+ if (cachedInstanceName.get() == null) {
+ cachedInstanceName.set(HdfsZooInstance.getInstance().getInstanceName());
+ }
+ }
+ }
+ }, 0);
+ }
+ }
+
+ synchronized (Monitor.class) {
if (fetching)
return;
fetching = true;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/80a7bb18/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index ea63cf2..f39fe4d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@ -26,8 +26,6 @@ import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Date;
import java.util.List;
-import java.util.TimerTask;
-import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
@@ -41,7 +39,6 @@ import org.apache.accumulo.monitor.Monitor;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.monitor.DedupedLogEvent;
import org.apache.accumulo.server.monitor.LogService;
-import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -49,7 +46,6 @@ abstract public class BasicServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
protected static final Logger log = Logger.getLogger(BasicServlet.class);
- static AtomicReference<String> cachedInstanceName = new AtomicReference<String>("(Unavailable)");
private static String bannerText;
private static String bannerColor;
private static String bannerBackground;
@@ -110,21 +106,6 @@ abstract public class BasicServlet extends HttpServlet {
// ignore improperly formatted user cookie
}
}
- synchronized (BasicServlet.class) {
- // Learn our instance name asynchronously so we don't hang up if zookeeper is down
- if (cachedInstanceName.get() == null) {
- SimpleTimer.getInstance().schedule(new TimerTask() {
- @Override
- public void run() {
- synchronized (BasicServlet.class) {
- if (cachedInstanceName.get() == null) {
- cachedInstanceName.set(HdfsZooInstance.getInstance().getInstanceName());
- }
- }
- }
- }, 0);
- }
- }
// BEGIN PAGE
sb.append("<!--\n");
@@ -174,7 +155,7 @@ abstract public class BasicServlet extends HttpServlet {
}
sb.append("<div id='headertitle'>");
sb.append("<h1>").append(getTitle(req)).append("</h1></div>\n");
- sb.append("<div id='subheader'>Instance Name: ").append(cachedInstanceName.get()).append(" Version: ").append(Constants.VERSION)
+ sb.append("<div id='subheader'>Instance Name: ").append(Monitor.cachedInstanceName.get()).append(" Version: ").append(Constants.VERSION)
.append("\n");
sb.append("<br><span class='smalltext'>Instance ID: ").append(HdfsZooInstance.getInstance().getInstanceID()).append("</span>\n");
sb.append("<br><span class='smalltext'>").append(new Date().toString().replace(" ", " ")).append("</span>");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/80a7bb18/server/tracer/.gitignore
----------------------------------------------------------------------
diff --git a/server/tracer/.gitignore b/server/tracer/.gitignore
index 56204d2..e7d7fb1 100644
--- a/server/tracer/.gitignore
+++ b/server/tracer/.gitignore
@@ -23,3 +23,4 @@
/.pydevproject
/.idea
/*.iml
+/target/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/80a7bb18/trace/.gitignore
----------------------------------------------------------------------
diff --git a/trace/.gitignore b/trace/.gitignore
index 56204d2..59a826f 100644
--- a/trace/.gitignore
+++ b/trace/.gitignore
@@ -23,3 +23,4 @@
/.pydevproject
/.idea
/*.iml
+/bin/
[4/8] accumulo git commit: ACCUMULO-3837 compare current value
against the default, not null
Posted by ec...@apache.org.
ACCUMULO-3837 compare current value against the default, not null
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af8d3bf1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af8d3bf1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af8d3bf1
Branch: refs/heads/1.7
Commit: af8d3bf1111b151aef6d2a2c85ca94a7653f1b2d
Parents: 80a7bb1
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:26:06 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:26:06 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/af8d3bf1/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 60f5772..0113fb6 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
@@ -58,7 +58,6 @@ import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
-import org.apache.accumulo.monitor.servlets.BasicServlet;
import org.apache.accumulo.monitor.servlets.DefaultServlet;
import org.apache.accumulo.monitor.servlets.GcStatusServlet;
import org.apache.accumulo.monitor.servlets.JSONServlet;
@@ -171,7 +170,8 @@ public class Monitor {
private ZooLock monitorLock;
- public static AtomicReference<String> cachedInstanceName = new AtomicReference<String>("(Unavailable)");
+ private static final String DEFAULT_INSTANCE_NAME = "(Unavailable)";
+ public static AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
private static class EventCounter {
@@ -249,12 +249,12 @@ public class Monitor {
synchronized (Monitor.class) {
// Learn our instance name asynchronously so we don't hang up if zookeeper is down
- if (Monitor.cachedInstanceName.get() == null) {
+ if (cachedInstanceName.get().equals(DEFAULT_INSTANCE_NAME)) {
SimpleTimer.getInstance().schedule(new TimerTask() {
@Override
public void run() {
synchronized (Monitor.class) {
- if (cachedInstanceName.get() == null) {
+ if (cachedInstanceName.get().equals(DEFAULT_INSTANCE_NAME)) {
cachedInstanceName.set(HdfsZooInstance.getInstance().getInstanceName());
}
}
[6/8] accumulo git commit: Merge branch '1.6' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Posted by ec...@apache.org.
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/99aa9a96
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/99aa9a96
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/99aa9a96
Branch: refs/heads/1.7
Commit: 99aa9a965d5f5d19cf4f0405a077b5fc957d2eec
Parents: af8d3bf b4f6e5e
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:36:43 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:36:43 2015 -0400
----------------------------------------------------------------------
assemble/bin/accumulo | 5 -----
assemble/bin/stop-here.sh | 2 +-
.../java/org/apache/accumulo/server/init/Initialize.java | 2 +-
.../src/main/java/org/apache/accumulo/tserver/Tablet.java | 8 +++++---
4 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[2/8] accumulo git commit: ACCUMULO-3327 merge to 1.7
Posted by ec...@apache.org.
ACCUMULO-3327 merge to 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81bd5078
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81bd5078
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81bd5078
Branch: refs/heads/1.7
Commit: 81bd5078181f46745cb9fd60b1a4179f4fc4c68f
Parents: 5e2a06d 2a16771
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 10:43:12 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 10:43:12 2015 -0400
----------------------------------------------------------------------
.../accumulo/monitor/servlets/BasicServlet.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/81bd5078/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
----------------------------------------------------------------------
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index 6dd9f52,ea63cf2..43ab121
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@@ -47,10 -49,10 +48,10 @@@ abstract public class BasicServlet exte
private static final long serialVersionUID = 1L;
protected static final Logger log = Logger.getLogger(BasicServlet.class);
- static String cachedInstanceName = null;
+ static AtomicReference<String> cachedInstanceName = new AtomicReference<String>("(Unavailable)");
- private static String bannerText;
- private static String bannerColor;
- private static String bannerBackground;
+ private String bannerText;
+ private String bannerColor;
+ private String bannerBackground;
abstract protected String getTitle(HttpServletRequest req);
@@@ -110,13 -112,13 +111,13 @@@
}
synchronized (BasicServlet.class) {
// Learn our instance name asynchronously so we don't hang up if zookeeper is down
- if (cachedInstanceName == null) {
+ if (cachedInstanceName.get() == null) {
- SimpleTimer.getInstance().schedule(new TimerTask() {
+ SimpleTimer.getInstance(Monitor.getContext().getConfiguration()).schedule(new TimerTask() {
@Override
public void run() {
synchronized (BasicServlet.class) {
- if (cachedInstanceName == null) {
- cachedInstanceName = Monitor.getContext().getInstance().getInstanceName();
+ if (cachedInstanceName.get() == null) {
- cachedInstanceName.set(HdfsZooInstance.getInstance().getInstanceName());
++ cachedInstanceName.set(Monitor.getContext().getInstance().getInstanceName());
}
}
}
@@@ -172,9 -174,9 +173,9 @@@
}
sb.append("<div id='headertitle'>");
sb.append("<h1>").append(getTitle(req)).append("</h1></div>\n");
- sb.append("<div id='subheader'>Instance Name: ").append(cachedInstanceName).append(" Version: ").append(Constants.VERSION)
- sb.append("<div id='subheader'>Instance Name: ").append(cachedInstanceName.get()).append(" Version: ").append(Constants.VERSION)
-- .append("\n");
- sb.append("<br><span class='smalltext'>Instance ID: ").append(HdfsZooInstance.getInstance().getInstanceID()).append("</span>\n");
++ sb.append("<div id='subheader'>Instance Name: ").append(cachedInstanceName.get()).append(" Version: ")
++ .append(Constants.VERSION).append("\n");
+ sb.append("<br><span class='smalltext'>Instance ID: ").append(Monitor.getContext().getInstance().getInstanceID()).append("</span>\n");
sb.append("<br><span class='smalltext'>").append(new Date().toString().replace(" ", " ")).append("</span>");
sb.append("</div>\n"); // end <div id='subheader'>
sb.append("</div>\n"); // end <div id='header'>
[8/8] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ec...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5320861a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5320861a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5320861a
Branch: refs/heads/1.7
Commit: 5320861a829565797840d2462accceef6cda3293
Parents: 9840938 99aa9a9
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:37:00 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:37:00 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/8] accumulo git commit: ACCUMULO-3837 merge to 1.7
Posted by ec...@apache.org.
ACCUMULO-3837 merge to 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b1620c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b1620c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b1620c8
Branch: refs/heads/1.7
Commit: 9b1620c83ef4982f2748445333312404adbd3511
Parents: 81bd507 af8d3bf
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:36:09 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:36:09 2015 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/monitor/Monitor.java | 22 ++++++++++++++++++++
.../accumulo/monitor/servlets/BasicServlet.java | 21 +------------------
2 files changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b1620c8/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index ba977a7,0113fb6..800fce2
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -29,6 -29,9 +29,8 @@@ import java.util.List
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+ import java.util.TimerTask;
-import java.util.TreeMap;
+ import java.util.concurrent.atomic.AtomicReference;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Connector;
@@@ -85,13 -84,15 +87,14 @@@ import org.apache.accumulo.server.monit
import org.apache.accumulo.server.problems.ProblemReports;
import org.apache.accumulo.server.problems.ProblemType;
import org.apache.accumulo.server.security.SecurityUtil;
-import org.apache.accumulo.server.security.SystemCredentials;
import org.apache.accumulo.server.util.Halt;
import org.apache.accumulo.server.util.TableInfoUtil;
+ import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.server.zookeeper.ZooLock;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.log4j.Logger;
import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.net.HostAndPort;
@@@ -240,6 -248,22 +246,22 @@@ public class Monitor
return;
synchronized (Monitor.class) {
+ // Learn our instance name asynchronously so we don't hang up if zookeeper is down
+ if (cachedInstanceName.get().equals(DEFAULT_INSTANCE_NAME)) {
- SimpleTimer.getInstance().schedule(new TimerTask() {
++ SimpleTimer.getInstance(config.getConfiguration()).schedule(new TimerTask() {
+ @Override
+ public void run() {
+ synchronized (Monitor.class) {
+ if (cachedInstanceName.get().equals(DEFAULT_INSTANCE_NAME)) {
+ cachedInstanceName.set(HdfsZooInstance.getInstance().getInstanceName());
+ }
+ }
+ }
+ }, 0);
+ }
+ }
+
+ synchronized (Monitor.class) {
if (fetching)
return;
fetching = true;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b1620c8/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
----------------------------------------------------------------------
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index 43ab121,f39fe4d..fac18cd
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@@ -38,9 -36,9 +36,8 @@@ import javax.servlet.http.HttpServletRe
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.monitor.Monitor;
-import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.monitor.DedupedLogEvent;
import org.apache.accumulo.server.monitor.LogService;
- import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@@ -48,10 -46,9 +45,9 @@@ abstract public class BasicServlet exte
private static final long serialVersionUID = 1L;
protected static final Logger log = Logger.getLogger(BasicServlet.class);
- static AtomicReference<String> cachedInstanceName = new AtomicReference<String>("(Unavailable)");
- private static String bannerText;
- private static String bannerColor;
- private static String bannerBackground;
+ private String bannerText;
+ private String bannerColor;
+ private String bannerBackground;
abstract protected String getTitle(HttpServletRequest req);
@@@ -173,9 -155,9 +154,9 @@@
}
sb.append("<div id='headertitle'>");
sb.append("<h1>").append(getTitle(req)).append("</h1></div>\n");
- sb.append("<div id='subheader'>Instance Name: ").append(cachedInstanceName.get()).append(" Version: ")
- sb.append("<div id='subheader'>Instance Name: ").append(Monitor.cachedInstanceName.get()).append(" Version: ").append(Constants.VERSION)
- .append("\n");
- sb.append("<br><span class='smalltext'>Instance ID: ").append(HdfsZooInstance.getInstance().getInstanceID()).append("</span>\n");
++ sb.append("<div id='subheader'>Instance Name: ").append(Monitor.cachedInstanceName.get()).append(" Version: ")
+ .append(Constants.VERSION).append("\n");
+ sb.append("<br><span class='smalltext'>Instance ID: ").append(Monitor.getContext().getInstance().getInstanceID()).append("</span>\n");
sb.append("<br><span class='smalltext'>").append(new Date().toString().replace(" ", " ")).append("</span>");
sb.append("</div>\n"); // end <div id='subheader'>
sb.append("</div>\n"); // end <div id='header'>
[7/8] accumulo git commit: Merge branch '1.7' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Posted by ec...@apache.org.
Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9840938f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9840938f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9840938f
Branch: refs/heads/1.7
Commit: 9840938ff5b7d489da28336bdc0181133a6304e4
Parents: 9b1620c 24ea8d1
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:36:55 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:36:55 2015 -0400
----------------------------------------------------------------------
CHANGES | 4 +
DEPENDENCIES | 21 +
UPGRADING.md | 106 ++
assemble/bin/accumulo | 1 -
assemble/bin/config.sh | 6 +-
assemble/bin/start-server.sh | 4 +-
assemble/bin/stop-here.sh | 2 +-
assemble/pom.xml | 2 +-
core/pom.xml | 2 +-
.../core/client/impl/ConditionalWriterImpl.java | 2 +-
.../mapreduce/lib/util/ConfiguratorBase.java | 277 ++++
.../lib/util/FileOutputConfigurator.java | 170 +++
.../mapreduce/lib/util/InputConfigurator.java | 462 +++++++
.../mapreduce/lib/util/OutputConfigurator.java | 196 +++
.../client/mapreduce/lib/util/package-info.java | 22 +
.../accumulo/core/file/rfile/bcfile/Utils.java | 2 +-
.../iterators/user/IntersectingIterator.java | 19 +-
.../mapred/AccumuloFileOutputFormatTest.java | 2 +
.../mapreduce/AccumuloFileOutputFormatTest.java | 2 +
docs/pom.xml | 2 +-
.../main/asciidoc/chapters/administration.txt | 2 +-
docs/src/main/asciidoc/chapters/kerberos.txt | 83 +-
examples/simple/pom.xml | 2 +-
.../accumulo/examples/simple/shard/Index.java | 7 +-
fate/pom.xml | 2 +-
maven-plugin/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
.../standalone/StandaloneAccumuloCluster.java | 33 +-
.../standalone/StandaloneClusterControl.java | 84 +-
.../impl/MiniAccumuloClusterImpl.java | 17 +-
.../impl/MiniAccumuloConfigImpl.java | 8 +-
.../StandaloneAccumuloClusterTest.java | 53 +
.../StandaloneClusterControlTest.java | 82 ++
pom.xml | 12 +-
proxy/pom.xml | 2 +-
.../java/org/apache/accumulo/proxy/Proxy.java | 5 +
server/base/pom.xml | 2 +-
.../server/GarbageCollectionLogger.java | 116 ++
.../apache/accumulo/server/init/Initialize.java | 2 +-
.../accumulo/server/util/SendLogToChainsaw.java | 2 +-
server/gc/pom.xml | 2 +-
server/master/pom.xml | 2 +-
server/monitor/pom.xml | 2 +-
.../org/apache/accumulo/monitor/util/Table.java | 2 +-
.../monitor/util/celltypes/NumberType.java | 2 +-
server/native/pom.xml | 6 +-
server/tracer/pom.xml | 2 +-
server/tserver/pom.xml | 2 +-
.../server/GarbageCollectionLogger.java | 116 --
.../apache/accumulo/tserver/FileManager.java | 2 +-
.../accumulo/tserver/log/LocalWALRecovery.java | 75 +-
.../accumulo/tserver/tablet/RootFilesTest.java | 7 +-
shell/pom.xml | 2 +-
.../shell/commands/FormatterCommandTest.java | 2 +-
start/pom.xml | 2 +-
.../start/classloader/AccumuloClassLoader.java | 7 +-
.../classloader/vfs/UniqueFileReplicator.java | 3 +-
test/pom.xml | 2 +-
.../accumulo/test/continuous/TimeBinner.java | 3 +
.../test/continuous/UndefinedAnalyzer.java | 84 +-
.../test/functional/CacheTestWriter.java | 3 +
.../apache/accumulo/test/randomwalk/Node.java | 16 +-
.../test/randomwalk/multitable/CopyTable.java | 3 +
.../test/randomwalk/multitable/CopyTool.java | 54 +-
.../accumulo/harness/AccumuloClusterIT.java | 3 +-
.../StandaloneAccumuloClusterConfiguration.java | 11 +-
.../apache/accumulo/proxy/SimpleProxyBase.java | 1268 +++++++++++-------
.../apache/accumulo/proxy/TBinaryProxyIT.java | 12 +-
.../apache/accumulo/proxy/TCompactProxyIT.java | 11 +-
.../accumulo/proxy/TJsonProtocolProxyIT.java | 12 +-
.../apache/accumulo/proxy/TTupleProxyIT.java | 12 +-
.../apache/accumulo/test/AuditMessageIT.java | 5 +-
.../apache/accumulo/test/ImportExportIT.java | 18 +-
.../accumulo/test/functional/CleanTmpIT.java | 12 +-
.../accumulo/test/functional/ConstraintIT.java | 24 +-
.../accumulo/test/functional/DurabilityIT.java | 44 +-
.../test/replication/ReplicationIT.java | 144 +-
trace/pom.xml | 2 +-
78 files changed, 2849 insertions(+), 952 deletions(-)
----------------------------------------------------------------------