You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/05/31 22:13:02 UTC
[1/9] accumulo git commit: ACCUMULO-3873 Add ambari-installed
client.conf location
Repository: accumulo
Updated Branches:
refs/heads/1.6 76c545bb3 -> cc25f5135
refs/heads/1.7 f7be66e69 -> 4815ec45a
refs/heads/master f15a451d0 -> e88f64235
ACCUMULO-3873 Add ambari-installed client.conf location
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc25f513
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc25f513
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cc25f513
Branch: refs/heads/1.6
Commit: cc25f5135fbb5ec20f01870de3c068596d98eb2f
Parents: e7f93b6
Author: Josh Elser <el...@apache.org>
Authored: Sun May 31 01:08:05 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 31 16:12:23 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/ClientConfiguration.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc25f513/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 17ad10b..a71b7e1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -180,6 +180,7 @@ public class ClientConfiguration extends CompositeConfiguration {
clientConfPaths.add(System.getenv("ACCUMULO_HOME") + File.separator + "conf" + File.separator + GLOBAL_CONF_FILENAME);
}
clientConfPaths.add("/etc/accumulo/" + GLOBAL_CONF_FILENAME);
+ clientConfPaths.add("/etc/accumulo/conf/" + GLOBAL_CONF_FILENAME);
}
return clientConfPaths;
}
[3/9] accumulo git commit: ACCUMULO-3875 Remove unnecessary
synchronization and conditional.
Posted by el...@apache.org.
ACCUMULO-3875 Remove unnecessary synchronization and conditional.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7f93b68
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7f93b68
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7f93b68
Branch: refs/heads/1.7
Commit: e7f93b685c8686c8107f7da833f5d20ed5242722
Parents: 76c545b
Author: Josh Elser <el...@apache.org>
Authored: Sun May 31 14:26:58 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 31 16:12:23 2015 -0400
----------------------------------------------------------------------
.../impl/MiniAccumuloClusterControl.java | 31 +++++++++-----------
1 file changed, 14 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7f93b68/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
index c2faf81..fee0016 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
@@ -20,7 +20,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map.Entry;
import java.util.concurrent.ExecutionException;
@@ -56,7 +55,7 @@ public class MiniAccumuloClusterControl implements ClusterControl {
Process gcProcess = null;
Process monitor = null;
Process tracer = null;
- List<Process> tabletServerProcesses = Collections.synchronizedList(new ArrayList<Process>());
+ final List<Process> tabletServerProcesses = new ArrayList<Process>();
public MiniAccumuloClusterControl(MiniAccumuloClusterImpl cluster) {
Preconditions.checkNotNull(cluster);
@@ -228,23 +227,21 @@ public class MiniAccumuloClusterControl implements ClusterControl {
}
break;
case TABLET_SERVER:
- if (tabletServerProcesses != null) {
- synchronized (tabletServerProcesses) {
- try {
- for (Process tserver : tabletServerProcesses) {
- try {
- cluster.stopProcessWithTimeout(tserver, 30, TimeUnit.SECONDS);
- } catch (ExecutionException e) {
- log.warn("TabletServer did not fully stop after 30 seconds", e);
- } catch (TimeoutException e) {
- log.warn("TabletServer did not fully stop after 30 seconds", e);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
+ synchronized (tabletServerProcesses) {
+ try {
+ for (Process tserver : tabletServerProcesses) {
+ try {
+ cluster.stopProcessWithTimeout(tserver, 30, TimeUnit.SECONDS);
+ } catch (ExecutionException e) {
+ log.warn("TabletServer did not fully stop after 30 seconds", e);
+ } catch (TimeoutException e) {
+ log.warn("TabletServer did not fully stop after 30 seconds", e);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
}
- } finally {
- tabletServerProcesses.clear();
}
+ } finally {
+ tabletServerProcesses.clear();
}
}
break;
[6/9] accumulo git commit: ACCUMULO-3873 Add ambari-installed
client.conf location
Posted by el...@apache.org.
ACCUMULO-3873 Add ambari-installed client.conf location
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc25f513
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc25f513
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cc25f513
Branch: refs/heads/1.7
Commit: cc25f5135fbb5ec20f01870de3c068596d98eb2f
Parents: e7f93b6
Author: Josh Elser <el...@apache.org>
Authored: Sun May 31 01:08:05 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 31 16:12:23 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/ClientConfiguration.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc25f513/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 17ad10b..a71b7e1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -180,6 +180,7 @@ public class ClientConfiguration extends CompositeConfiguration {
clientConfPaths.add(System.getenv("ACCUMULO_HOME") + File.separator + "conf" + File.separator + GLOBAL_CONF_FILENAME);
}
clientConfPaths.add("/etc/accumulo/" + GLOBAL_CONF_FILENAME);
+ clientConfPaths.add("/etc/accumulo/conf/" + GLOBAL_CONF_FILENAME);
}
return clientConfPaths;
}
[9/9] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e88f6423
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e88f6423
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e88f6423
Branch: refs/heads/master
Commit: e88f642357bf7d6169fd4376092205d512de6b63
Parents: f15a451 4815ec4
Author: Josh Elser <el...@apache.org>
Authored: Sun May 31 16:12:48 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 31 16:12:48 2015 -0400
----------------------------------------------------------------------
.../core/client/ClientConfiguration.java | 1 +
.../impl/MiniAccumuloClusterControl.java | 31 +++++++++-----------
2 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[4/9] accumulo git commit: ACCUMULO-3875 Remove unnecessary
synchronization and conditional.
Posted by el...@apache.org.
ACCUMULO-3875 Remove unnecessary synchronization and conditional.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7f93b68
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7f93b68
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7f93b68
Branch: refs/heads/master
Commit: e7f93b685c8686c8107f7da833f5d20ed5242722
Parents: 76c545b
Author: Josh Elser <el...@apache.org>
Authored: Sun May 31 14:26:58 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 31 16:12:23 2015 -0400
----------------------------------------------------------------------
.../impl/MiniAccumuloClusterControl.java | 31 +++++++++-----------
1 file changed, 14 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7f93b68/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
index c2faf81..fee0016 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
@@ -20,7 +20,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map.Entry;
import java.util.concurrent.ExecutionException;
@@ -56,7 +55,7 @@ public class MiniAccumuloClusterControl implements ClusterControl {
Process gcProcess = null;
Process monitor = null;
Process tracer = null;
- List<Process> tabletServerProcesses = Collections.synchronizedList(new ArrayList<Process>());
+ final List<Process> tabletServerProcesses = new ArrayList<Process>();
public MiniAccumuloClusterControl(MiniAccumuloClusterImpl cluster) {
Preconditions.checkNotNull(cluster);
@@ -228,23 +227,21 @@ public class MiniAccumuloClusterControl implements ClusterControl {
}
break;
case TABLET_SERVER:
- if (tabletServerProcesses != null) {
- synchronized (tabletServerProcesses) {
- try {
- for (Process tserver : tabletServerProcesses) {
- try {
- cluster.stopProcessWithTimeout(tserver, 30, TimeUnit.SECONDS);
- } catch (ExecutionException e) {
- log.warn("TabletServer did not fully stop after 30 seconds", e);
- } catch (TimeoutException e) {
- log.warn("TabletServer did not fully stop after 30 seconds", e);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
+ synchronized (tabletServerProcesses) {
+ try {
+ for (Process tserver : tabletServerProcesses) {
+ try {
+ cluster.stopProcessWithTimeout(tserver, 30, TimeUnit.SECONDS);
+ } catch (ExecutionException e) {
+ log.warn("TabletServer did not fully stop after 30 seconds", e);
+ } catch (TimeoutException e) {
+ log.warn("TabletServer did not fully stop after 30 seconds", e);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
}
- } finally {
- tabletServerProcesses.clear();
}
+ } finally {
+ tabletServerProcesses.clear();
}
}
break;
[7/9] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@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/4815ec45
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4815ec45
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4815ec45
Branch: refs/heads/1.7
Commit: 4815ec45a97efc2dc912f363328b66566823f6c2
Parents: f7be66e cc25f51
Author: Josh Elser <el...@apache.org>
Authored: Sun May 31 16:12:40 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 31 16:12:40 2015 -0400
----------------------------------------------------------------------
.../core/client/ClientConfiguration.java | 1 +
.../impl/MiniAccumuloClusterControl.java | 31 +++++++++-----------
2 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4815ec45/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4815ec45/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
----------------------------------------------------------------------
[8/9] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@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/4815ec45
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4815ec45
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4815ec45
Branch: refs/heads/master
Commit: 4815ec45a97efc2dc912f363328b66566823f6c2
Parents: f7be66e cc25f51
Author: Josh Elser <el...@apache.org>
Authored: Sun May 31 16:12:40 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 31 16:12:40 2015 -0400
----------------------------------------------------------------------
.../core/client/ClientConfiguration.java | 1 +
.../impl/MiniAccumuloClusterControl.java | 31 +++++++++-----------
2 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4815ec45/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4815ec45/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
----------------------------------------------------------------------
[5/9] accumulo git commit: ACCUMULO-3873 Add ambari-installed
client.conf location
Posted by el...@apache.org.
ACCUMULO-3873 Add ambari-installed client.conf location
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc25f513
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc25f513
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cc25f513
Branch: refs/heads/master
Commit: cc25f5135fbb5ec20f01870de3c068596d98eb2f
Parents: e7f93b6
Author: Josh Elser <el...@apache.org>
Authored: Sun May 31 01:08:05 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 31 16:12:23 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/ClientConfiguration.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc25f513/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 17ad10b..a71b7e1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -180,6 +180,7 @@ public class ClientConfiguration extends CompositeConfiguration {
clientConfPaths.add(System.getenv("ACCUMULO_HOME") + File.separator + "conf" + File.separator + GLOBAL_CONF_FILENAME);
}
clientConfPaths.add("/etc/accumulo/" + GLOBAL_CONF_FILENAME);
+ clientConfPaths.add("/etc/accumulo/conf/" + GLOBAL_CONF_FILENAME);
}
return clientConfPaths;
}
[2/9] accumulo git commit: ACCUMULO-3875 Remove unnecessary
synchronization and conditional.
Posted by el...@apache.org.
ACCUMULO-3875 Remove unnecessary synchronization and conditional.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7f93b68
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7f93b68
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7f93b68
Branch: refs/heads/1.6
Commit: e7f93b685c8686c8107f7da833f5d20ed5242722
Parents: 76c545b
Author: Josh Elser <el...@apache.org>
Authored: Sun May 31 14:26:58 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 31 16:12:23 2015 -0400
----------------------------------------------------------------------
.../impl/MiniAccumuloClusterControl.java | 31 +++++++++-----------
1 file changed, 14 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7f93b68/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
index c2faf81..fee0016 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
@@ -20,7 +20,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map.Entry;
import java.util.concurrent.ExecutionException;
@@ -56,7 +55,7 @@ public class MiniAccumuloClusterControl implements ClusterControl {
Process gcProcess = null;
Process monitor = null;
Process tracer = null;
- List<Process> tabletServerProcesses = Collections.synchronizedList(new ArrayList<Process>());
+ final List<Process> tabletServerProcesses = new ArrayList<Process>();
public MiniAccumuloClusterControl(MiniAccumuloClusterImpl cluster) {
Preconditions.checkNotNull(cluster);
@@ -228,23 +227,21 @@ public class MiniAccumuloClusterControl implements ClusterControl {
}
break;
case TABLET_SERVER:
- if (tabletServerProcesses != null) {
- synchronized (tabletServerProcesses) {
- try {
- for (Process tserver : tabletServerProcesses) {
- try {
- cluster.stopProcessWithTimeout(tserver, 30, TimeUnit.SECONDS);
- } catch (ExecutionException e) {
- log.warn("TabletServer did not fully stop after 30 seconds", e);
- } catch (TimeoutException e) {
- log.warn("TabletServer did not fully stop after 30 seconds", e);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
+ synchronized (tabletServerProcesses) {
+ try {
+ for (Process tserver : tabletServerProcesses) {
+ try {
+ cluster.stopProcessWithTimeout(tserver, 30, TimeUnit.SECONDS);
+ } catch (ExecutionException e) {
+ log.warn("TabletServer did not fully stop after 30 seconds", e);
+ } catch (TimeoutException e) {
+ log.warn("TabletServer did not fully stop after 30 seconds", e);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
}
- } finally {
- tabletServerProcesses.clear();
}
+ } finally {
+ tabletServerProcesses.clear();
}
}
break;