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 2013/12/04 23:16:59 UTC
[1/2] git commit: ACCUMULO-1790 found a missing config item,
and behavior change
Updated Branches:
refs/heads/1.5.1-SNAPSHOT cbb42194b -> c1fa5573c
ACCUMULO-1790 found a missing config item, and behavior change
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/36561a0e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/36561a0e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/36561a0e
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 36561a0e0384bd295fccd2b48364a080b74851bb
Parents: b693168
Author: Eric Newton <er...@gmail.com>
Authored: Wed Dec 4 16:51:47 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Dec 4 17:08:59 2013 -0500
----------------------------------------------------------------------
conf/examples/1GB/native-standalone/accumulo-site.xml | 1 +
conf/examples/1GB/standalone/accumulo-site.xml | 1 +
conf/examples/3GB/native-standalone/accumulo-site.xml | 1 +
conf/examples/3GB/standalone/accumulo-site.xml | 1 +
.../examples/512MB/native-standalone/accumulo-site.xml | 1 +
conf/examples/512MB/standalone/accumulo-site.xml | 1 +
.../accumulo/server/master/CoordinateRecoveryTask.java | 13 ++++++++-----
7 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml b/conf/examples/1GB/native-standalone/accumulo-site.xml
index e995bfe..3f21599 100644
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@ -100,6 +100,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/standalone/accumulo-site.xml b/conf/examples/1GB/standalone/accumulo-site.xml
index cf081a7..f477092 100644
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@ -95,6 +95,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/native-standalone/accumulo-site.xml b/conf/examples/3GB/native-standalone/accumulo-site.xml
index 5709556..6730955 100644
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@ -85,6 +85,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/standalone/accumulo-site.xml b/conf/examples/3GB/standalone/accumulo-site.xml
index 5709556..6730955 100644
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@ -85,6 +85,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/native-standalone/accumulo-site.xml b/conf/examples/512MB/native-standalone/accumulo-site.xml
index 7f7d88d..f241f4c 100644
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@ -95,6 +95,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/standalone/accumulo-site.xml b/conf/examples/512MB/standalone/accumulo-site.xml
index 99a5153..b51014e 100644
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@ -95,6 +95,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
index b98f29d..84e6be8 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
@@ -407,11 +407,14 @@ public class CoordinateRecoveryTask implements Runnable {
private void removeOldRecoverFiles() throws IOException {
long now = System.currentTimeMillis();
long maxAgeInMillis = ServerConfiguration.getSystemConfiguration().getTimeInMillis(Property.MASTER_RECOVERY_MAXAGE);
- FileStatus[] children = fs.listStatus(new Path(ServerConstants.getRecoveryDir()));
- if (children != null) {
- for (FileStatus child : children) {
- if (now - child.getModificationTime() > maxAgeInMillis && !delete(child.getPath())) {
- log.warn("Unable to delete old recovery directory: " + child.getPath());
+ Path recoveryDir = new Path(ServerConstants.getRecoveryDir());
+ if (fs.exists(recoveryDir)) {
+ FileStatus[] children = fs.listStatus(recoveryDir);
+ if (children != null) {
+ for (FileStatus child : children) {
+ if (now - child.getModificationTime() > maxAgeInMillis && !delete(child.getPath())) {
+ log.warn("Unable to delete old recovery directory: " + child.getPath());
+ }
}
}
}
[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c1fa5573
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c1fa5573
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c1fa5573
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: c1fa5573c63b42f35b21e960a8d75b1a7bfa77bb
Parents: cbb4219 36561a0
Author: Eric Newton <er...@gmail.com>
Authored: Wed Dec 4 17:15:15 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Dec 4 17:15:15 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------