[1/3] accumulo git commit: ACCUMULO-3838 Fix race condition in ReplicationIT
Repository: accumulo
Updated Branches:
refs/heads/1.7 25d9b2854 -> 81fdad8d1
refs/heads/master 9cd82738e -> cf9b9a4ea
ACCUMULO-3838 Fix race condition in ReplicationIT
It was possible that the master sees a WAL that's closed,
copies it to replication and then deletes it from metadata
before the test sees the log entry.
Make sure that the test observes wals from metadata or
replication to make sure it passes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81fdad8d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81fdad8d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81fdad8d
Branch: refs/heads/1.7
Commit: 81fdad8d1b09a919feaa15885cd0b95bf15daa6e
Parents: 25d9b28
Author: Josh Elser
Authored: Wed May 20 23:13:37 2015 -0400
Committer: Josh Elser
Committed: Wed May 20 23:59:59 2015 -0400
--
.../test/replication/ReplicationIT.java | 144 ++-
1 file changed, 73 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/81fdad8d/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 34c699e..e2ee215 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@ -41,6 +41,7 @@ import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.IteratorSetting.Column;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.TableOfflineException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.conf.Property;
@@ -135,6 +136,7 @@ public class ReplicationIT extends ConfigurableMacIT {
scanner.setRange(new Range());
for (Entry entry : scanner) {
if (Thread.interrupted()) {
+Thread.currentThread().interrupt();
return logs;
}
@@ -148,6 +150,31 @@ public class ReplicationIT extends ConfigurableMacIT {
return logs;
}
+ private Multimap getAllLogs(Connector conn) throws
TableNotFoundException {
+Multimap logs = getLogs(conn);
+try {
+ Scanner scanner = conn.createScanner(ReplicationTable.NAME,
Authorizations.EMPTY);
+ StatusSection.limit(scanner);
+ Text buff = new Text();
+ for (Entry entry : scanner) {
+if (Thread.interrupted()) {
+ Thread.currentThread().interrupt();
+ return logs;
+}
+
+StatusSection.getFile(entry.getKey(), buff);
+String file = buff.toString();
+StatusSection.getTableId(entry.getKey(), buff);
+String tableId = buff.toString();
+
+logs.put(file, tableId);
+ }
+} catch (TableOfflineException e) {
+ log.debug("Replication table isn't online yet");
+}
+return logs;
+ }
+
private void waitForGCLock(Connector conn) throws InterruptedException {
// Check if the GC process has the lock before wasting our retry attempts
ZooKeeperInstance zki = (ZooKeeperInstance) conn.getInstance();
@@ -513,7 +540,7 @@ public class ReplicationIT extends ConfigurableMacIT {
// when that happens
while (keepRunning.get()) {
try {
-logs.putAll(getLogs(conn));
+logs.putAll(getAllLogs(conn));
} catch (TableNotFoundException e) {
log.error("Metadata table doesn't exist");
}
@@ -604,6 +631,7 @@ public class ReplicationIT extends ConfigurableMacIT {
while (observedLogs.hasNext()) {
Entry observedLog = observedLogs.next();
if (replicationTableId.equals(observedLog.getValue())) {
+log.info("Removing {} because its tableId is for the replication
table", observedLog);
observedLogs.remove();
}
}
@@ -612,9 +640,10 @@ public class ReplicationIT extends ConfigurableMacIT {
// They might not yet all be closed though (might be newfile)
Assert.assertEquals("Metadata log distribution: " + logs, logs.keySet(),
replFiles);
+final Configuration conf = new Configuration();
for (String replFile : replFiles) {
Path p = new Path(replFile);
- FileSystem fs = p.getFileSystem(new Configuration());
+ FileSystem fs = p.getFileSystem(conf);
Assert.assertTrue("File does not exist anymore, it was likely
incorrectly garbage collected: " + p, fs.exists(p));
}
}
@@ -665,86 +694,59 @@ public class
[3/3] accumulo git commit: Merge branch '1.7'
Merge branch '1.7'
Conflicts:
test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf9b9a4e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf9b9a4e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf9b9a4e
Branch: refs/heads/master
Commit: cf9b9a4ea6cfd03a053e64c7feca964ca9c026aa
Parents: 9cd8273 81fdad8
Author: Josh Elser
Authored: Thu May 21 00:03:56 2015 -0400
Committer: Josh Elser
Committed: Thu May 21 00:03:56 2015 -0400
--
.../test/replication/ReplicationIT.java | 93 +++-
1 file changed, 50 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf9b9a4e/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
--
diff --cc
test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 54b42f4,e2ee215..ef81f2c
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@@ -132,32 -130,21 +133,33 @@@ public class ReplicationIT extends Conf
}
private Multimap getLogs(Connector conn) throws
TableNotFoundException {
-Multimap logs = HashMultimap.create();
+// Map of server to tableId
+Multimap serverToTableID = HashMultimap.create();
Scanner scanner = conn.createScanner(MetadataTable.NAME,
Authorizations.EMPTY);
-scanner.fetchColumnFamily(LogColumnFamily.NAME);
-scanner.setRange(new Range());
+scanner.setRange(MetadataSchema.TabletsSection.getRange());
+
scanner.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME);
+for (Entry entry : scanner) {
+ TServerInstance key = new TServerInstance(entry.getValue(),
entry.getKey().getColumnQualifier());
+ byte[] tableId = KeyExtent.tableOfMetadataRow(entry.getKey().getRow());
+ serverToTableID.put(key, new String(tableId, UTF_8));
+}
+// Map of logs to tableId
+Multimap logs = HashMultimap.create();
+scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
+scanner.setRange(MetadataSchema.CurrentLogsSection.getRange());
for (Entry entry : scanner) {
if (Thread.interrupted()) {
+ Thread.currentThread().interrupt();
return logs;
}
-
- LogEntry logEntry = LogEntry.fromKeyValue(entry.getKey(),
entry.getValue());
-
- for (String log : logEntry.logSet) {
-// Need to normalize the log file from LogEntry
-logs.put(new Path(log).toString(),
logEntry.extent.getTableId().toString());
+ Text path = new Text();
+ MetadataSchema.CurrentLogsSection.getPath(entry.getKey(), path);
+ Text session = new Text();
+ Text hostPort = new Text();
+ MetadataSchema.CurrentLogsSection.getTabletServer(entry.getKey(),
hostPort, session);
+ TServerInstance server = new
TServerInstance(AddressUtil.parseAddress(hostPort.toString(), false),
session.toString());
+ for (String tableId : serverToTableID.get(server)) {
+logs.put(new Path(path.toString()).toString(), tableId);
}
}
return logs;
@@@ -575,12 -638,12 +603,13 @@@
// We should have *some* reference to each log that was seen in the
metadata table
// They might not yet all be closed though (might be newfile)
-Assert.assertEquals("Metadata log distribution: " + logs, logs.keySet(),
replFiles);
+Assert.assertTrue("Metadata log distribution: " + logs + "replFiles " +
replFiles, logs.keySet().containsAll(replFiles));
+Assert.assertTrue("Difference between replication entries and current
logs is bigger than one", logs.keySet().size() - replFiles.size() <= 1);
+ final Configuration conf = new Configuration();
for (String replFile : replFiles) {
Path p = new Path(replFile);
- FileSystem fs = p.getFileSystem(new Configuration());
+ FileSystem fs = p.getFileSystem(conf);
Assert.assertTrue("File does not exist anymore, it was likely
incorrectly garbage collected: " + p, fs.exists(p));
}
}
@@@ -631,53 -694,59 +660,31 @@@
conn.securityOperations().grantTablePermission("root",
ReplicationTable.NAME, TablePermission.WRITE);
conn.tableOperations().deleteRows(ReplicationTable.NAME, null, null);
- final AtomicBoolean keepRunning = new AtomicBoolean(true);
- final Set metadataWals = new HashSet<>();
-
- Thread t = new Thread(new Runnable() {
- @Override
- public void run() {
- // Should really be able to interrupt here, but the Scanner throws a
fit to the logger
[2/3] accumulo git commit: ACCUMULO-3838 Fix race condition in ReplicationIT
ACCUMULO-3838 Fix race condition in ReplicationIT
It was possible that the master sees a WAL that's closed,
copies it to replication and then deletes it from metadata
before the test sees the log entry.
Make sure that the test observes wals from metadata or
replication to make sure it passes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81fdad8d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81fdad8d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81fdad8d
Branch: refs/heads/master
Commit: 81fdad8d1b09a919feaa15885cd0b95bf15daa6e
Parents: 25d9b28
Author: Josh Elser
Authored: Wed May 20 23:13:37 2015 -0400
Committer: Josh Elser
Committed: Wed May 20 23:59:59 2015 -0400
--
.../test/replication/ReplicationIT.java | 144 ++-
1 file changed, 73 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/81fdad8d/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 34c699e..e2ee215 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@ -41,6 +41,7 @@ import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.IteratorSetting.Column;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.TableOfflineException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.conf.Property;
@@ -135,6 +136,7 @@ public class ReplicationIT extends ConfigurableMacIT {
scanner.setRange(new Range());
for (Entry entry : scanner) {
if (Thread.interrupted()) {
+Thread.currentThread().interrupt();
return logs;
}
@@ -148,6 +150,31 @@ public class ReplicationIT extends ConfigurableMacIT {
return logs;
}
+ private Multimap getAllLogs(Connector conn) throws
TableNotFoundException {
+Multimap logs = getLogs(conn);
+try {
+ Scanner scanner = conn.createScanner(ReplicationTable.NAME,
Authorizations.EMPTY);
+ StatusSection.limit(scanner);
+ Text buff = new Text();
+ for (Entry entry : scanner) {
+if (Thread.interrupted()) {
+ Thread.currentThread().interrupt();
+ return logs;
+}
+
+StatusSection.getFile(entry.getKey(), buff);
+String file = buff.toString();
+StatusSection.getTableId(entry.getKey(), buff);
+String tableId = buff.toString();
+
+logs.put(file, tableId);
+ }
+} catch (TableOfflineException e) {
+ log.debug("Replication table isn't online yet");
+}
+return logs;
+ }
+
private void waitForGCLock(Connector conn) throws InterruptedException {
// Check if the GC process has the lock before wasting our retry attempts
ZooKeeperInstance zki = (ZooKeeperInstance) conn.getInstance();
@@ -513,7 +540,7 @@ public class ReplicationIT extends ConfigurableMacIT {
// when that happens
while (keepRunning.get()) {
try {
-logs.putAll(getLogs(conn));
+logs.putAll(getAllLogs(conn));
} catch (TableNotFoundException e) {
log.error("Metadata table doesn't exist");
}
@@ -604,6 +631,7 @@ public class ReplicationIT extends ConfigurableMacIT {
while (observedLogs.hasNext()) {
Entry observedLog = observedLogs.next();
if (replicationTableId.equals(observedLog.getValue())) {
+log.info("Removing {} because its tableId is for the replication
table", observedLog);
observedLogs.remove();
}
}
@@ -612,9 +640,10 @@ public class ReplicationIT extends ConfigurableMacIT {
// They might not yet all be closed though (might be newfile)
Assert.assertEquals("Metadata log distribution: " + logs, logs.keySet(),
replFiles);
+final Configuration conf = new Configuration();
for (String replFile : replFiles) {
Path p = new Path(replFile);
- FileSystem fs = p.getFileSystem(new Configuration());
+ FileSystem fs = p.getFileSystem(conf);
Assert.assertTrue("File does not exist anymore, it was likely
incorrectly garbage collected: " + p, fs.exists(p));
}
}
@@ -665,86 +694,59 @@ public class ReplicationIT extends ConfigurableMacIT {
conn.securityOperations().grantTablePermission("root",
ReplicationTable.
svn commit: r952136 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/ 1.7/apidocs/
Author: ctubbsii Date: Thu May 21 02:31:11 2015 New Revision: 952136 Log: Publish site: Add Trent Nadeau to contributors. Added: websites/production/accumulo/content/ - copied from r952135, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r952135, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r952135, websites/production/accumulo/content/1.5/apidocs/ websites/production/accumulo/content/1.6/apidocs/ - copied from r952135, websites/production/accumulo/content/1.6/apidocs/ websites/production/accumulo/content/1.7/apidocs/ - copied from r952135, websites/production/accumulo/content/1.7/apidocs/
svn commit: r952135 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot Date: Thu May 21 02:29:12 2015 New Revision: 952135 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/people.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 21 02:29:12 2015 @@ -1 +1 @@ -1680640 +1680722 Modified: websites/staging/accumulo/trunk/content/people.html == --- websites/staging/accumulo/trunk/content/people.html (original) +++ websites/staging/accumulo/trunk/content/people.html Thu May 21 02:29:12 2015 @@ -311,6 +311,7 @@ Latest 1.5 release: 1.5.2Tim Halloran Tim Reardon Travis Pinney + Trent Nadeauhttp://www.anthemengineering.com/";>Anthem Engineering LLCET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Tristen Georgiouhttp://phemi.com";>PHEMIPT (http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8 / http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7) Vicky Kak Vincent Russell
svn commit: r1680722 - /accumulo/site/trunk/content/people.mdtext
Author: ctubbsii Date: Thu May 21 02:29:02 2015 New Revision: 1680722 URL: http://svn.apache.org/r1680722 Log: Add Trent Nadeau to contributors. Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1680722&r1=1680721&r2=1680722&view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Thu May 21 02:29:02 2015 @@ -123,6 +123,7 @@ Contributors Tim Halloran Tim Reardon Travis Pinney + Trent Nadeauhttp://www.anthemengineering.com/";>Anthem Engineering LLCET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Tristen Georgiouhttp://phemi.com";>PHEMIPT (http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8 / http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7) Vicky Kak Vincent Russell
[2/6] accumulo git commit: ACCUMULO-3839 Perform sanity check on the proper replacement pair element.
ACCUMULO-3839 Perform sanity check on the proper replacement pair element.
The sanity check is meant to warn if a volume being
replaced is still listed in instance.volumes. The opposite
is nonsensical.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63be7d36
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63be7d36
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63be7d36
Branch: refs/heads/1.7
Commit: 63be7d366ce04ef89a1d6ff3bf4af8406b3a60d5
Parents: c4eff0c
Author: Josh Elser
Authored: Wed May 20 22:03:40 2015 -0400
Committer: Josh Elser
Committed: Wed May 20 22:05:45 2015 -0400
--
.../src/main/java/org/apache/accumulo/server/init/Initialize.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/63be7d36/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index fd46ab7..fcc22c5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -533,7 +533,7 @@ public class Initialize {
Path versionPath = new Path(aBasePath, ServerConstants.VERSION_DIR);
for (Pair replacementVolume :
ServerConstants.getVolumeReplacements()) {
- if (aBasePath.equals(replacementVolume.getSecond()))
+ if (aBasePath.equals(replacementVolume.getFirst()))
log.error(aBasePath + " is set to be replaced in " +
Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " +
Property.INSTANCE_VOLUMES + ". It is highly recommended that this
property be removed as data could still be written to this volume.");
}
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25d9b285
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25d9b285
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25d9b285
Branch: refs/heads/master
Commit: 25d9b2854bd53562b67939b7b69c80924eb6e32f
Parents: 1faee53 63be7d3
Author: Josh Elser
Authored: Wed May 20 22:26:24 2015 -0400
Committer: Josh Elser
Committed: Wed May 20 22:26:24 2015 -0400
--
.../src/main/java/org/apache/accumulo/server/init/Initialize.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/25d9b285/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
--
diff --cc
server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index c6f1dd8,fcc22c5..9b9dac9
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@@ -701,13 -532,14 +701,13 @@@ public class Initialize implements Keyw
Path iidPath = new Path(aBasePath, ServerConstants.INSTANCE_ID_DIR);
Path versionPath = new Path(aBasePath, ServerConstants.VERSION_DIR);
+UUID uuid = UUID.fromString(ZooUtil.getInstanceIDFromHdfs(iidPath,
SiteConfiguration.getInstance()));
for (Pair replacementVolume :
ServerConstants.getVolumeReplacements()) {
- if (aBasePath.equals(replacementVolume.getSecond()))
+ if (aBasePath.equals(replacementVolume.getFirst()))
-log.error(aBasePath + " is set to be replaced in " +
Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " +
-Property.INSTANCE_VOLUMES + ". It is highly recommended that this
property be removed as data could still be written to this volume.");
+log.error(aBasePath + " is set to be replaced in " +
Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " +
Property.INSTANCE_VOLUMES
++ ". It is highly recommended that this property be removed as
data could still be written to this volume.");
}
-UUID uuid = UUID.fromString(ZooUtil.getInstanceIDFromHdfs(iidPath,
ServerConfiguration.getSiteConfiguration()));
-
if (ServerConstants.DATA_VERSION !=
Accumulo.getAccumuloPersistentVersion(versionPath.getFileSystem(CachedConfiguration.getInstance()),
versionPath)) {
throw new IOException("Accumulo " + Constants.VERSION + " cannot
initialize data version " + Accumulo.getAccumuloPersistentVersion(fs));
}
[6/6] accumulo git commit: Merge branch '1.7'
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/9cd82738 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9cd82738 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9cd82738 Branch: refs/heads/master Commit: 9cd82738e5a1b07c709c4407d977955eed58b91f Parents: acf6082 25d9b28 Author: Josh Elser Authored: Wed May 20 22:26:29 2015 -0400 Committer: Josh Elser Committed: Wed May 20 22:26:29 2015 -0400 -- .../src/main/java/org/apache/accumulo/server/init/Initialize.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9cd82738/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java --
[1/6] accumulo git commit: ACCUMULO-3839 Perform sanity check on the proper replacement pair element.
Repository: accumulo
Updated Branches:
refs/heads/1.6 c4eff0c2e -> 63be7d366
refs/heads/1.7 1faee537d -> 25d9b2854
refs/heads/master acf60826e -> 9cd82738e
ACCUMULO-3839 Perform sanity check on the proper replacement pair element.
The sanity check is meant to warn if a volume being
replaced is still listed in instance.volumes. The opposite
is nonsensical.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63be7d36
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63be7d36
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63be7d36
Branch: refs/heads/1.6
Commit: 63be7d366ce04ef89a1d6ff3bf4af8406b3a60d5
Parents: c4eff0c
Author: Josh Elser
Authored: Wed May 20 22:03:40 2015 -0400
Committer: Josh Elser
Committed: Wed May 20 22:05:45 2015 -0400
--
.../src/main/java/org/apache/accumulo/server/init/Initialize.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/63be7d36/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index fd46ab7..fcc22c5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -533,7 +533,7 @@ public class Initialize {
Path versionPath = new Path(aBasePath, ServerConstants.VERSION_DIR);
for (Pair replacementVolume :
ServerConstants.getVolumeReplacements()) {
- if (aBasePath.equals(replacementVolume.getSecond()))
+ if (aBasePath.equals(replacementVolume.getFirst()))
log.error(aBasePath + " is set to be replaced in " +
Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " +
Property.INSTANCE_VOLUMES + ". It is highly recommended that this
property be removed as data could still be written to this volume.");
}
[3/6] accumulo git commit: ACCUMULO-3839 Perform sanity check on the proper replacement pair element.
ACCUMULO-3839 Perform sanity check on the proper replacement pair element.
The sanity check is meant to warn if a volume being
replaced is still listed in instance.volumes. The opposite
is nonsensical.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63be7d36
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63be7d36
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63be7d36
Branch: refs/heads/master
Commit: 63be7d366ce04ef89a1d6ff3bf4af8406b3a60d5
Parents: c4eff0c
Author: Josh Elser
Authored: Wed May 20 22:03:40 2015 -0400
Committer: Josh Elser
Committed: Wed May 20 22:05:45 2015 -0400
--
.../src/main/java/org/apache/accumulo/server/init/Initialize.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/63be7d36/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index fd46ab7..fcc22c5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -533,7 +533,7 @@ public class Initialize {
Path versionPath = new Path(aBasePath, ServerConstants.VERSION_DIR);
for (Pair replacementVolume :
ServerConstants.getVolumeReplacements()) {
- if (aBasePath.equals(replacementVolume.getSecond()))
+ if (aBasePath.equals(replacementVolume.getFirst()))
log.error(aBasePath + " is set to be replaced in " +
Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " +
Property.INSTANCE_VOLUMES + ". It is highly recommended that this
property be removed as data could still be written to this volume.");
}
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25d9b285
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25d9b285
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25d9b285
Branch: refs/heads/1.7
Commit: 25d9b2854bd53562b67939b7b69c80924eb6e32f
Parents: 1faee53 63be7d3
Author: Josh Elser
Authored: Wed May 20 22:26:24 2015 -0400
Committer: Josh Elser
Committed: Wed May 20 22:26:24 2015 -0400
--
.../src/main/java/org/apache/accumulo/server/init/Initialize.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/25d9b285/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
--
diff --cc
server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index c6f1dd8,fcc22c5..9b9dac9
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@@ -701,13 -532,14 +701,13 @@@ public class Initialize implements Keyw
Path iidPath = new Path(aBasePath, ServerConstants.INSTANCE_ID_DIR);
Path versionPath = new Path(aBasePath, ServerConstants.VERSION_DIR);
+UUID uuid = UUID.fromString(ZooUtil.getInstanceIDFromHdfs(iidPath,
SiteConfiguration.getInstance()));
for (Pair replacementVolume :
ServerConstants.getVolumeReplacements()) {
- if (aBasePath.equals(replacementVolume.getSecond()))
+ if (aBasePath.equals(replacementVolume.getFirst()))
-log.error(aBasePath + " is set to be replaced in " +
Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " +
-Property.INSTANCE_VOLUMES + ". It is highly recommended that this
property be removed as data could still be written to this volume.");
+log.error(aBasePath + " is set to be replaced in " +
Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " +
Property.INSTANCE_VOLUMES
++ ". It is highly recommended that this property be removed as
data could still be written to this volume.");
}
-UUID uuid = UUID.fromString(ZooUtil.getInstanceIDFromHdfs(iidPath,
ServerConfiguration.getSiteConfiguration()));
-
if (ServerConstants.DATA_VERSION !=
Accumulo.getAccumuloPersistentVersion(versionPath.getFileSystem(CachedConfiguration.getInstance()),
versionPath)) {
throw new IOException("Accumulo " + Constants.VERSION + " cannot
initialize data version " + Accumulo.getAccumuloPersistentVersion(fs));
}
svn commit: r952062 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/ 1.7/apidocs/
Author: elserj Date: Wed May 20 17:06:59 2015 New Revision: 952062 Log: Publishing svnmucc operation to accumulo site by elserj Added: websites/production/accumulo/content/ - copied from r952061, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r952061, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r952061, websites/production/accumulo/content/1.5/apidocs/ websites/production/accumulo/content/1.6/apidocs/ - copied from r952061, websites/production/accumulo/content/1.6/apidocs/ websites/production/accumulo/content/1.7/apidocs/ - copied from r952061, websites/production/accumulo/content/1.7/apidocs/
svn commit: r1680640 - /accumulo/site/trunk/content/releasing.mdtext
Author: elserj Date: Wed May 20 17:06:35 2015 New Revision: 1680640 URL: http://svn.apache.org/r1680640 Log: ACCUMULO-3825 Note the addrelease form on projects.a.o Modified: accumulo/site/trunk/content/releasing.mdtext Modified: accumulo/site/trunk/content/releasing.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/releasing.mdtext?rev=1680640&r1=1680639&r2=1680640&view=diff == --- accumulo/site/trunk/content/releasing.mdtext (original) +++ accumulo/site/trunk/content/releasing.mdtext Wed May 20 17:06:35 2015 @@ -107,6 +107,10 @@ are releasing a bug-fix release, be sure 1.6.2, remove 1.6.1). The old tarballs removed from dist.apache.org will still be preserved in archive.apache.org automatically. +## Update projects.apache.org + +Fill out the [add release][addrelease] form to update the projects website. + ## Update the Website After a successful vote, this website needs to be updated with the new artifacts. @@ -157,3 +161,4 @@ Some good references that explain a few [7]: http://www.kb.cert.org/vuls/id/225657 [8]: http://www.apache.org/dev/cmsref#extpaths [9]: https://svn.apache.org/repos/asf/accumulo/site/trunk +[addrelease]: https://reporter.apache.org/addrelease.html?accumulo \ No newline at end of file
svn commit: r952061 - in /websites/staging/accumulo/trunk/content: ./ releasing.html
Author: buildbot Date: Wed May 20 17:06:41 2015 New Revision: 952061 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/releasing.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed May 20 17:06:41 2015 @@ -1 +1 @@ -1680636 +1680640 Modified: websites/staging/accumulo/trunk/content/releasing.html == --- websites/staging/accumulo/trunk/content/releasing.html (original) +++ websites/staging/accumulo/trunk/content/releasing.html Wed May 20 17:06:41 2015 @@ -286,6 +286,8 @@ tarballs, the GPG signatures and checksu are releasing a bug-fix release, be sure to delete the previous release in the same line (e.g. if you release 1.6.2, remove 1.6.1). The old tarballs removed from dist.apache.org will still be preserved in archive.apache.org automatically. +Update projects.apache.org +Fill out the https://reporter.apache.org/addrelease.html?accumulo";>add release form to update the projects website. Update the Website After a successful vote, this website needs to be updated with the new artifacts.
[4/4] accumulo git commit: Merge branch 'mac-with-existing-zookeeper' of github:tanadeau/accumulo
Merge branch 'mac-with-existing-zookeeper' of github:tanadeau/accumulo This closes #29 Signed-off-by: Christopher Tubbs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/acf60826 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/acf60826 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/acf60826 Branch: refs/heads/master Commit: acf60826e25f943653fd7875d3b01ef43b7adf77 Parents: a9d1ad4 6c22aab Author: Christopher Tubbs Authored: Wed May 20 12:50:38 2015 -0400 Committer: Christopher Tubbs Committed: Wed May 20 12:50:38 2015 -0400 -- minicluster/pom.xml | 10 ++ .../minicluster/MiniAccumuloRunner.java | 4 + .../impl/MiniAccumuloClusterImpl.java | 59 +- .../impl/MiniAccumuloConfigImpl.java| 37 ++- ...niAccumuloClusterExistingZooKeepersTest.java | 107 +++ pom.xml | 12 +++ 6 files changed, 199 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/acf60826/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/acf60826/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/acf60826/pom.xml --
[2/4] accumulo git commit: ACCUMULO-3000: Added config option and impl to use existing ZooKeeper
ACCUMULO-3000: Added config option and impl to use existing ZooKeeper
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dd55a161
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd55a161
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd55a161
Branch: refs/heads/master
Commit: dd55a161bad766158ec5e876a84debeb46de2465
Parents: d353b61
Author: Trent Nadeau
Authored: Thu Apr 16 14:35:54 2015 +
Committer: Trent Nadeau
Committed: Fri May 15 15:19:01 2015 -0400
--
.../minicluster/MiniAccumuloConfig.java | 13 +
.../minicluster/MiniAccumuloRunner.java | 4 ++
.../impl/MiniAccumuloClusterImpl.java | 59 +++-
.../impl/MiniAccumuloConfigImpl.java| 37 ++--
4 files changed, 83 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd55a161/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
index b71b771..932507d 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
@@ -108,6 +108,19 @@ public class MiniAccumuloConfig {
}
/**
+ * Configure an existing ZooKeeper instance to use. Calling this method is
optional. If not set, a new ZooKeeper instance is created.
+ *
+ * @param existingZooKeepers
+ * Connection string for a already-running ZooKeeper instance
+ *
+ * @since 1.7.0
+ */
+ public MiniAccumuloConfig setExistingZooKeepers(String existingZooKeepers) {
+impl.setExistingZooKeepers(existingZooKeepers);
+return this;
+ }
+
+ /**
* Sets the amount of memory to use in the master process. Calling this
method is optional. Default memory is 128M
*
* @param serverType
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd55a161/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
index 13a75b5..1f1be44 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
@@ -75,6 +75,7 @@ public class MiniAccumuloRunner {
private static final String NUM_T_SERVERS_PROP = "numTServers";
private static final String DIRECTORY_PROP = "directory";
private static final String INSTANCE_NAME_PROP = "instanceName";
+ private static final String EXISTING_ZOO_KEEPERS_PROP = "existingZooKeepers";
private static void printProperties() {
System.out.println("#mini Accumulo cluster runner properties.");
@@ -93,6 +94,7 @@ public class MiniAccumuloRunner {
System.out.println("#" + TSERVER_MEMORY_PROP + "=128M");
System.out.println("#" + ZOO_KEEPER_MEMORY_PROP + "=128M");
System.out.println("#" + JDWP_ENABLED_PROP + "=false");
+System.out.println("#" + EXISTING_ZOO_KEEPERS_PROP + "=localhost:2181");
System.out.println();
System.out.println("# Configuration normally placed in accumulo-site.xml
can be added using a site. prefix.");
@@ -167,6 +169,8 @@ public class MiniAccumuloRunner {
config.setZooKeeperPort(Integer.parseInt(opts.prop.getProperty(ZOO_KEEPER_PORT_PROP)));
if (opts.prop.containsKey(ZOO_KEEPER_STARTUP_TIME_PROP))
config.setZooKeeperStartupTime(Long.parseLong(opts.prop.getProperty(ZOO_KEEPER_STARTUP_TIME_PROP)));
+if (opts.prop.containsKey(EXISTING_ZOO_KEEPERS_PROP))
+
config.setExistingZooKeepers(opts.prop.getProperty(EXISTING_ZOO_KEEPERS_PROP));
if (opts.prop.containsKey(JDWP_ENABLED_PROP))
config.setJDWPEnabled(Boolean.parseBoolean(opts.prop.getProperty(JDWP_ENABLED_PROP)));
if (opts.prop.containsKey(ZOO_KEEPER_MEMORY_PROP))
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd55a161/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index a21ba64..dd20850 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/i
[1/4] accumulo git commit: ACCUMULO-3000: Added tests for "existing ZooKeeper" functionality
Repository: accumulo
Updated Branches:
refs/heads/master a9d1ad4a7 -> acf60826e
ACCUMULO-3000: Added tests for "existing ZooKeeper" functionality
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c069d1f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c069d1f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c069d1f
Branch: refs/heads/master
Commit: 0c069d1f5003fd309432765c863fb47c066a1d33
Parents: dd55a16
Author: Trent Nadeau
Authored: Tue Apr 21 10:47:11 2015 -0400
Committer: Trent Nadeau
Committed: Fri May 15 15:19:01 2015 -0400
--
.gitignore | 1 +
minicluster/pom.xml | 10 ++
...niAccumuloClusterExistingZooKeepersTest.java | 107 +++
pom.xml | 12 +++
4 files changed, 130 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c069d1f/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 56204d2..f7db771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/.pydevproject
/.idea
/*.iml
+.*.swp
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c069d1f/minicluster/pom.xml
--
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index ff390f9..afd459c 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -105,6 +105,16 @@
test
+ org.apache.curator
+ curator-framework
+ test
+
+
+ org.apache.curator
+ curator-test
+ test
+
+
org.easymock
easymock
test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c069d1f/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
--
diff --git
a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
new file mode 100644
index 000..d9fb63e
--- /dev/null
+++
b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.minicluster;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.commons.io.FileUtils;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.RetryOneTime;
+import org.apache.curator.test.TestingServer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MiniAccumuloClusterExistingZooKeepersTest {
+ private static final File BASE_DIR = new File(
+ System.getProperty("user.dir") + "/target/mini-tests/" +
MiniAccumuloClusterExistingZooKeepersTest.class.getName());
+
+ private static final String SECRET = "superSecret";
+
+ private static final Logger log =
LoggerFactory.getLogger(MiniAccumuloClusterExistingZooKeepersTest.class);
+ private TestingServer zooKeeper;
+ private MiniAccumuloCluster accumulo;
+
+ @Rule
+ public TestName testName = new TestName();
+
+ @Before
+ public void setupTestCluster() throws Exception {
+assertTrue(BASE_DIR.mkdirs() || BASE_DIR.isDirectory());
+File testDir = new File(BASE_DIR, testName.getMethodName());
+FileUtils.deleteQuietly(testDir);
+assertTrue(testDir.mkdir());
+
+
[3/4] accumulo git commit: ACCUMULO-3000: Use MAC config impl when using existing zookeepers
ACCUMULO-3000: Use MAC config impl when using existing zookeepers
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c22aabf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c22aabf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c22aabf
Branch: refs/heads/master
Commit: 6c22aabfc604c6a93f215496577f9ed6ae7372bc
Parents: 0c069d1
Author: Trent Nadeau
Authored: Tue May 12 17:36:38 2015 -0400
Committer: Trent Nadeau
Committed: Fri May 15 15:19:02 2015 -0400
--
.../accumulo/minicluster/MiniAccumuloConfig.java | 13 -
.../accumulo/minicluster/MiniAccumuloRunner.java | 2 +-
.../minicluster/impl/MiniAccumuloConfigImpl.java | 2 +-
.../MiniAccumuloClusterExistingZooKeepersTest.java | 6 +++---
4 files changed, 5 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c22aabf/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
index 932507d..b71b771 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
@@ -108,19 +108,6 @@ public class MiniAccumuloConfig {
}
/**
- * Configure an existing ZooKeeper instance to use. Calling this method is
optional. If not set, a new ZooKeeper instance is created.
- *
- * @param existingZooKeepers
- * Connection string for a already-running ZooKeeper instance
- *
- * @since 1.7.0
- */
- public MiniAccumuloConfig setExistingZooKeepers(String existingZooKeepers) {
-impl.setExistingZooKeepers(existingZooKeepers);
-return this;
- }
-
- /**
* Sets the amount of memory to use in the master process. Calling this
method is optional. Default memory is 128M
*
* @param serverType
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c22aabf/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
index 1f1be44..78af6a0 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
@@ -170,7 +170,7 @@ public class MiniAccumuloRunner {
if (opts.prop.containsKey(ZOO_KEEPER_STARTUP_TIME_PROP))
config.setZooKeeperStartupTime(Long.parseLong(opts.prop.getProperty(ZOO_KEEPER_STARTUP_TIME_PROP)));
if (opts.prop.containsKey(EXISTING_ZOO_KEEPERS_PROP))
-
config.setExistingZooKeepers(opts.prop.getProperty(EXISTING_ZOO_KEEPERS_PROP));
+
config.getImpl().setExistingZooKeepers(opts.prop.getProperty(EXISTING_ZOO_KEEPERS_PROP));
if (opts.prop.containsKey(JDWP_ENABLED_PROP))
config.setJDWPEnabled(Boolean.parseBoolean(opts.prop.getProperty(JDWP_ENABLED_PROP)));
if (opts.prop.containsKey(ZOO_KEEPER_MEMORY_PROP))
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c22aabf/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 25f3c99..f2c4b80 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -324,7 +324,7 @@ public class MiniAccumuloConfigImpl {
* Configure an existing ZooKeeper instance to use. Calling this method is
optional. If not set, a new ZooKeeper instance is created.
*
* @param existingZooKeepers
- * Connection string for a already-running ZooKeeper instance
+ * Connection string for a already-running ZooKeeper instance. A
null value will turn off this feature.
*
* @since 1.8.0
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c22aabf/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
--
diff --git
a/minicluster/src/test/java/org/apache/accumulo/minicluster/Mini
svn commit: r952060 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/ 1.7/apidocs/
Author: elserj Date: Wed May 20 16:47:44 2015 New Revision: 952060 Log: Publishing svnmucc operation to accumulo site by elserj Added: websites/production/accumulo/content/ - copied from r952059, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r952059, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r952059, websites/production/accumulo/content/1.5/apidocs/ websites/production/accumulo/content/1.6/apidocs/ - copied from r952059, websites/production/accumulo/content/1.6/apidocs/ websites/production/accumulo/content/1.7/apidocs/ - copied from r952059, websites/production/accumulo/content/1.7/apidocs/
svn commit: r1680636 - /accumulo/site/trunk/content/releasing.mdtext
Author: elserj Date: Wed May 20 16:45:53 2015 New Revision: 1680636 URL: http://svn.apache.org/r1680636 Log: ACCUMULO-3825 Update how to get the javadocs for a release Modified: accumulo/site/trunk/content/releasing.mdtext Modified: accumulo/site/trunk/content/releasing.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/releasing.mdtext?rev=1680636&r1=1680635&r2=1680636&view=diff == --- accumulo/site/trunk/content/releasing.mdtext (original) +++ accumulo/site/trunk/content/releasing.mdtext Wed May 20 16:45:53 2015 @@ -125,7 +125,7 @@ switch to Java 7). Despite the javadocs where they need to be committed using [extpaths][8]. You can follow the steps below to update the javadocs. -1. Extract javadocs from binary tarball from the release +1. Extract javadocs from binary tarball (1.5) or build the javadocs `mvn clean compile javadoc:aggregate` (>=1.6) 2. Run the vulnerability-check tool 3. Checkout the [Accumulo CMS repository][9] 4. Copy the entire apidocs folder in the appropriate version folder in the CMS repository (e.g. content/1.5/apidocs for a 1.5 release)
svn commit: r952059 - in /websites/staging/accumulo/trunk/content: ./ releasing.html
Author: buildbot Date: Wed May 20 16:45:59 2015 New Revision: 952059 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/releasing.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed May 20 16:45:59 2015 @@ -1 +1 @@ -1680599 +1680636 Modified: websites/staging/accumulo/trunk/content/releasing.html == --- websites/staging/accumulo/trunk/content/releasing.html (original) +++ websites/staging/accumulo/trunk/content/releasing.html Wed May 20 16:45:59 2015 @@ -302,7 +302,7 @@ switch to Java 7). Despite the javadocs where they need to be committed using http://www.apache.org/dev/cmsref#extpaths";>extpaths. You can follow the steps below to update the javadocs. -Extract javadocs from binary tarball from the release +Extract javadocs from binary tarball (1.5) or build the javadocs mvn clean compile javadoc:aggregate (>=1.6) Run the vulnerability-check tool Checkout the https://svn.apache.org/repos/asf/accumulo/site/trunk";>Accumulo CMS repository Copy the entire apidocs folder in the appropriate version folder in the CMS repository (e.g. content/1.5/apidocs for a 1.5 release)
[07/21] accumulo git commit: ACCUMULO-3800 Add DEPENDENCIES file
ACCUMULO-3800 Add DEPENDENCIES file * Prevent a new DEPENDENCIES file from being generated by the maven-remote-resources-plugin's apache-jar-resource-bundle. * Create a minimal DEPENDENCIES file which refers to the POMs. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eef4dfe1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eef4dfe1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eef4dfe1 Branch: refs/heads/master Commit: eef4dfe1f074ee5197ef2d10f56915c43aba81a1 Parents: dc1d0de Author: Christopher Tubbs Authored: Tue May 12 12:10:28 2015 -0400 Committer: Josh Elser Committed: Tue May 12 12:44:08 2015 -0400 -- DEPENDENCIES | 21 + 1 file changed, 21 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eef4dfe1/DEPENDENCIES -- diff --git a/DEPENDENCIES b/DEPENDENCIES new file mode 100644 index 000..5a98c0f --- /dev/null +++ b/DEPENDENCIES @@ -0,0 +1,21 @@ + + +Apache Accumulo depends on artifacts which can be found in Maven Central. + +Each module has its own dependencies. Please refer to the individual +modules' pom.xml files for a comprehensive listing.
[11/21] accumulo git commit: ACCUMULO-3743 One more CHANGES change.
ACCUMULO-3743 One more CHANGES change. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9fda3bbb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9fda3bbb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9fda3bbb Branch: refs/heads/1.7 Commit: 9fda3bbb2c5a06764412c2ed665e47e75a9762da Parents: 0d9c05e Author: Josh Elser Authored: Tue May 12 13:42:23 2015 -0400 Committer: Josh Elser Committed: Tue May 12 13:42:23 2015 -0400 -- CHANGES | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9fda3bbb/CHANGES -- diff --git a/CHANGES b/CHANGES index 7750d66..d966db4 100644 --- a/CHANGES +++ b/CHANGES @@ -474,6 +474,7 @@ Release Notes - Accumulo - Version 1.7.0 * [ACCUMULO-3791] - Agitator start/stop scripts collide variable names * [ACCUMULO-3792] - org.apache.accumulo.test.randomwalk.Node#getMapReduceJars needs to include htrace * [ACCUMULO-3800] - Extra DEPENDENCIES file after new apache.pom +* [ACCUMULO-3803] - Resurrect mapreduce.lib.util for 1.7.0 ** Improvement * [ACCUMULO-898] - look into replacing cloudtrace
[05/21] accumulo git commit: Revert "ACCUMULO-3800 Add exclusion for DEPENDENCIES"
Revert "ACCUMULO-3800 Add exclusion for DEPENDENCIES" This reverts commit 8e99ed222db49e0f9a4f03ae90d1cbcf44bb1a87. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc1d0def Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc1d0def Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc1d0def Branch: refs/heads/1.7 Commit: dc1d0defb79b5fde68631f1063be021fb3420f74 Parents: c16fd9d Author: Christopher Tubbs Authored: Tue May 12 11:42:12 2015 -0400 Committer: Josh Elser Committed: Tue May 12 12:44:01 2015 -0400 -- pom.xml | 9 - 1 file changed, 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/dc1d0def/pom.xml -- diff --git a/pom.xml b/pom.xml index f4c734b..5bf65e8 100644 --- a/pom.xml +++ b/pom.xml @@ -955,15 +955,6 @@ - - org.apache.rat - apache-rat-plugin - - - DEPENDENCIES - - -
[08/21] accumulo git commit: ACCUMULO-3800 Add DEPENDENCIES file
ACCUMULO-3800 Add DEPENDENCIES file * Prevent a new DEPENDENCIES file from being generated by the maven-remote-resources-plugin's apache-jar-resource-bundle. * Create a minimal DEPENDENCIES file which refers to the POMs. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eef4dfe1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eef4dfe1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eef4dfe1 Branch: refs/heads/1.7 Commit: eef4dfe1f074ee5197ef2d10f56915c43aba81a1 Parents: dc1d0de Author: Christopher Tubbs Authored: Tue May 12 12:10:28 2015 -0400 Committer: Josh Elser Committed: Tue May 12 12:44:08 2015 -0400 -- DEPENDENCIES | 21 + 1 file changed, 21 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eef4dfe1/DEPENDENCIES -- diff --git a/DEPENDENCIES b/DEPENDENCIES new file mode 100644 index 000..5a98c0f --- /dev/null +++ b/DEPENDENCIES @@ -0,0 +1,21 @@ + + +Apache Accumulo depends on artifacts which can be found in Maven Central. + +Each module has its own dependencies. Please refer to the individual +modules' pom.xml files for a comprehensive listing.
[16/21] accumulo git commit: ACCUMULO-3820 Remove unused variable
ACCUMULO-3820 Remove unused variable
* Remove warning for unused variable.
* Update comment explaining why the parameter wasn't used.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6524b072
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6524b072
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6524b072
Branch: refs/heads/1.7
Commit: 6524b0720350170696c1692430ad47dd5f4bffd0
Parents: ed5b53b
Author: Christopher Tubbs
Authored: Wed May 20 11:08:07 2015 -0400
Committer: Christopher Tubbs
Committed: Wed May 20 11:08:07 2015 -0400
--
.../apache/accumulo/test/randomwalk/multitable/CopyTool.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6524b072/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
--
diff --git
a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
index b4e509c..251a064 100644
---
a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
+++
b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
@@ -19,9 +19,9 @@ package org.apache.accumulo.test.randomwalk.multitable;
import java.io.IOException;
import org.apache.accumulo.core.client.ClientConfiguration;
+import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
import org.apache.accumulo.core.client.admin.DelegationTokenConfig;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
@@ -74,9 +74,7 @@ public class CopyTool extends Configured implements Tool {
final AuthenticationToken token;
if
(clientConf.getBoolean(ClientProperty.INSTANCE_RPC_SASL_ENABLED.getKey(),
false)) {
// Use the Kerberos creds to request a DelegationToken for MapReduce to
use
- final String keytab = args[1];
-
- // Better be logged in. Could use the keytab, but we're already logged
in soo..
+ // We could use the specified keytab (args[1]), but we're already logged
in and don't need to, so we can just use the current user
KerberosToken kt = new KerberosToken();
try {
UserGroupInformation user = UserGroupInformation.getCurrentUser();
[04/21] accumulo git commit: ACCUMULO-3801 moved GarbageCollectionLogger to proper module
ACCUMULO-3801 moved GarbageCollectionLogger to proper module
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c16fd9d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c16fd9d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c16fd9d1
Branch: refs/heads/master
Commit: c16fd9d1552085bf135c399e1ca32fad3737edb3
Parents: 4db7766
Author: Keith Turner
Authored: Tue May 12 11:08:53 2015 -0400
Committer: Josh Elser
Committed: Tue May 12 12:00:09 2015 -0400
--
.../server/GarbageCollectionLogger.java | 116 +++
.../server/GarbageCollectionLogger.java | 116 ---
2 files changed, 116 insertions(+), 116 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c16fd9d1/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
new file mode 100644
index 000..389a544
--- /dev/null
+++
b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.server;
+
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.server.util.Halt;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GarbageCollectionLogger {
+ private static final Logger log =
LoggerFactory.getLogger(GarbageCollectionLogger.class);
+
+ private final HashMap prevGcTime = new HashMap();
+ private long lastMemorySize = 0;
+ private long gcTimeIncreasedCount = 0;
+ private static long lastMemoryCheckTime = 0;
+
+ public GarbageCollectionLogger() {}
+
+ public synchronized void logGCInfo(AccumuloConfiguration conf) {
+final long now = System.currentTimeMillis();
+
+List gcmBeans =
ManagementFactory.getGarbageCollectorMXBeans();
+Runtime rt = Runtime.getRuntime();
+
+StringBuilder sb = new StringBuilder("gc");
+
+boolean sawChange = false;
+
+long maxIncreaseInCollectionTime = 0;
+
+for (GarbageCollectorMXBean gcBean : gcmBeans) {
+ Long prevTime = prevGcTime.get(gcBean.getName());
+ long pt = 0;
+ if (prevTime != null) {
+pt = prevTime;
+ }
+
+ long time = gcBean.getCollectionTime();
+
+ if (time - pt != 0) {
+sawChange = true;
+ }
+
+ long increaseInCollectionTime = time - pt;
+ sb.append(String.format(" %s=%,.2f(+%,.2f) secs", gcBean.getName(), time
/ 1000.0, increaseInCollectionTime / 1000.0));
+ maxIncreaseInCollectionTime = Math.max(increaseInCollectionTime,
maxIncreaseInCollectionTime);
+ prevGcTime.put(gcBean.getName(), time);
+}
+
+long mem = rt.freeMemory();
+if (maxIncreaseInCollectionTime == 0) {
+ gcTimeIncreasedCount = 0;
+} else {
+ gcTimeIncreasedCount++;
+ if (gcTimeIncreasedCount > 3 && mem < rt.maxMemory() * 0.05) {
+log.warn("Running low on memory");
+gcTimeIncreasedCount = 0;
+ }
+}
+
+if (mem > lastMemorySize) {
+ sawChange = true;
+}
+
+String sign = "+";
+if (mem - lastMemorySize <= 0) {
+ sign = "";
+}
+
+sb.append(String.format(" freemem=%,d(%s%,d) totalmem=%,d", mem, sign,
(mem - lastMemorySize), rt.totalMemory()));
+
+if (sawChange) {
+ log.debug(sb.toString());
+}
+
+final long keepAliveTimeout =
conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT);
+if (lastMemoryCheckTime > 0 && lastMemoryCheckTime < now) {
+ final long diff = now - lastMemoryCheckTime;
+ if (diff > keepAliveTimeout + 1000) {
+log.warn(Str
[17/21] accumulo git commit: ACCUMULO-3819 Update findbugs and checkstyle tools
ACCUMULO-3819 Update findbugs and checkstyle tools
* Bump findbugs and checkstyle build tools to check for more problems.
* Fix newly detected problems (mainly lack of checking for null when listing
directory contents) to ensure the build passes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b577410c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b577410c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b577410c
Branch: refs/heads/1.7
Commit: b577410c677b5adb2f1c0eb1c1f8f6a9061cd0ad
Parents: 6524b07
Author: Christopher Tubbs
Authored: Wed May 20 11:50:32 2015 -0400
Committer: Christopher Tubbs
Committed: Wed May 20 11:50:32 2015 -0400
--
.../core/client/impl/ConditionalWriterImpl.java | 2 +-
.../accumulo/core/file/rfile/bcfile/Utils.java | 2 +-
.../iterators/user/IntersectingIterator.java| 19 ++---
.../mapred/AccumuloFileOutputFormatTest.java| 2 +
.../mapreduce/AccumuloFileOutputFormatTest.java | 2 +
.../accumulo/examples/simple/shard/Index.java | 7 +-
.../impl/MiniAccumuloClusterImpl.java | 17 ++--
.../impl/MiniAccumuloConfigImpl.java| 8 +-
pom.xml | 6 +-
.../accumulo/server/util/SendLogToChainsaw.java | 2 +-
.../org/apache/accumulo/monitor/util/Table.java | 2 +-
.../monitor/util/celltypes/NumberType.java | 2 +-
.../accumulo/tserver/log/LocalWALRecovery.java | 75 -
.../accumulo/tserver/tablet/RootFilesTest.java | 7 +-
.../shell/commands/FormatterCommandTest.java| 2 +-
.../start/classloader/AccumuloClassLoader.java | 7 +-
.../classloader/vfs/UniqueFileReplicator.java | 3 +-
.../accumulo/test/continuous/TimeBinner.java| 3 +
.../test/continuous/UndefinedAnalyzer.java | 84 ++--
.../test/functional/CacheTestWriter.java| 3 +
.../apache/accumulo/test/randomwalk/Node.java | 16 ++--
.../apache/accumulo/test/AuditMessageIT.java| 5 +-
22 files changed, 159 insertions(+), 117 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b577410c/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index b8375dc..24040e6 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -182,7 +182,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
@Override
public int compareTo(Delayed o) {
QCMutation oqcm = (QCMutation) o;
- return Long.valueOf(resetTime).compareTo(Long.valueOf(oqcm.resetTime));
+ return Long.compare(resetTime, oqcm.resetTime);
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b577410c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
index 6cb04a1..5e84f10 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
@@ -351,7 +351,7 @@ public final class Utils {
@Override
public int hashCode() {
- return (major << 16 + minor);
+ return ((major << 16) + minor);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b577410c/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
index 63d6a34..e7338f3 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
@@ -232,19 +232,20 @@ public class IntersectingIterator implements
SortedKeyValueIterator {
// If we are past the target, this is a valid result
if (docIDCompare < 0) {
break;
-}
-// if this source is not yet at the currentCQ then advance in this
source
-if (docIDCompare > 0) {
+} else if (docIDCompare > 0) {
+ // if this source is not yet at the currentCQ then advance in this
[01/21] accumulo git commit: Revert "ACCUMULO-3793 use numctl to turn on memory interleaving"
Repository: accumulo
Updated Branches:
refs/heads/1.7 ed5b53b93 -> 1faee537d
refs/heads/master e22103ca9 -> a9d1ad4a7
Revert "ACCUMULO-3793 use numctl to turn on memory interleaving"
This reverts commit b82148777c023b21578d06ef451fdd70770107a5.
Conflicts:
assemble/bin/config.sh
assemble/bin/start-server.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4db7766d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4db7766d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4db7766d
Branch: refs/heads/1.7
Commit: 4db7766d77497c4ab8b8cbd997fe1b4c267308f3
Parents: 8e99ed2
Author: Josh Elser
Authored: Tue May 12 11:59:11 2015 -0400
Committer: Josh Elser
Committed: Tue May 12 11:59:11 2015 -0400
--
assemble/bin/config.sh | 9 -
assemble/bin/start-server.sh | 8
2 files changed, 4 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4db7766d/assemble/bin/config.sh
--
diff --git a/assemble/bin/config.sh b/assemble/bin/config.sh
index ed393bb..d9bf8d4 100755
--- a/assemble/bin/config.sh
+++ b/assemble/bin/config.sh
@@ -104,15 +104,6 @@ then
fi
export HADOOP_PREFIX
-NUMA=`which numactl 2>/dev/null`
-NUMACTL_EXISTS="$?"
-NUMACTL_ARGS="--interleave=all"
-if [[ ${NUMACTL_EXISTS} -eq 0 ]] ; then
- export NUMA_CMD="${NUMA} ${NUMACTL_ARGS}"
-else
- export NUMA_CMD=""
-fi
-
export HADOOP_HOME=$HADOOP_PREFIX
export HADOOP_HOME_WARN_SUPPRESS=true
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4db7766d/assemble/bin/start-server.sh
--
diff --git a/assemble/bin/start-server.sh b/assemble/bin/start-server.sh
index 3587ec9..2fb4c4c 100755
--- a/assemble/bin/start-server.sh
+++ b/assemble/bin/start-server.sh
@@ -77,12 +77,12 @@ if [[ -z "$PID" ]]; then
COMMAND="${bin}/accumulo_watcher.sh ${LOGHOST}"
fi
- if [[ $HOST == localhost || $HOST == "$(hostname -f)" || $HOST = "$IP" ]];
then
- ${NUMA_CMD} "$COMMAND" "${SERVICE}" --address "${ADDRESS}"
>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out"
2>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err" &
+ if [ "$HOST" = "localhost" -o "$HOST" = "`hostname -f`" -o "$HOST" = "$ip"
]; then
+ ${bin}/accumulo ${SERVICE} --address ${ADDRESS}
>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err &
MAX_FILES_OPEN=$(ulimit -n)
else
- $SSH "$HOST" "bash -c 'exec nohup ${NUMA_CMD} $COMMAND ${SERVICE}
--address ${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
- MAX_FILES_OPEN=$($SSH "$HOST" "/usr/bin/env bash -c 'ulimit -n'")
+ $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address
${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
+ MAX_FILES_OPEN=$($SSH $HOST "/usr/bin/env bash -c 'ulimit -n'")
fi
if [[ -n $MAX_FILES_OPEN && -n $SLAVES ]] ; then
[19/21] accumulo git commit: Merge tag '1.7.0' into 1.7
Merge tag '1.7.0' into 1.7
Apache Accumulo 1.7.0
Conflicts:
assemble/pom.xml
core/pom.xml
docs/pom.xml
examples/simple/pom.xml
fate/pom.xml
maven-plugin/pom.xml
minicluster/pom.xml
pom.xml
proxy/pom.xml
server/base/pom.xml
server/gc/pom.xml
server/master/pom.xml
server/monitor/pom.xml
server/native/pom.xml
server/tracer/pom.xml
server/tserver/pom.xml
shell/pom.xml
start/pom.xml
test/pom.xml
trace/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1faee537
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1faee537
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1faee537
Branch: refs/heads/1.7
Commit: 1faee537d8d557297d20f3d084b4e16127d00600
Parents: b577410 8cba812
Author: Christopher Tubbs
Authored: Wed May 20 12:07:59 2015 -0400
Committer: Christopher Tubbs
Committed: Wed May 20 12:07:59 2015 -0400
--
CHANGES | 1 +
assemble/bin/config.sh | 6 +++---
assemble/bin/start-server.sh | 4 ++--
pom.xml | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1faee537/assemble/bin/config.sh
--
diff --cc assemble/bin/config.sh
index ed393bb,d9bf8d4..9dfd164
--- a/assemble/bin/config.sh
+++ b/assemble/bin/config.sh
@@@ -104,15 -104,6 +104,15 @@@ the
fi
export HADOOP_PREFIX
- NUMA=`which numactl 2>/dev/null`
- NUMACTL_EXISTS="$?"
- NUMACTL_ARGS="--interleave=all"
++NUMA=$(which numactl 2>/dev/null)
++NUMACTL_EXISTS=$?
++NUMACTL_ARGS='--interleave=all'
+if [[ ${NUMACTL_EXISTS} -eq 0 ]] ; then
+ export NUMA_CMD="${NUMA} ${NUMACTL_ARGS}"
+else
+ export NUMA_CMD=""
+fi
+
export HADOOP_HOME=$HADOOP_PREFIX
export HADOOP_HOME_WARN_SUPPRESS=true
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1faee537/assemble/bin/start-server.sh
--
diff --cc assemble/bin/start-server.sh
index 3587ec9,2fb4c4c..8266457
--- a/assemble/bin/start-server.sh
+++ b/assemble/bin/start-server.sh
@@@ -77,12 -77,12 +77,12 @@@ if [[ -z "$PID" ]]; the
COMMAND="${bin}/accumulo_watcher.sh ${LOGHOST}"
fi
- if [ "$HOST" = "localhost" -o "$HOST" = "`hostname -f`" -o "$HOST" = "$ip"
]; then
- ${bin}/accumulo ${SERVICE} --address ${ADDRESS}
>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err &
+ if [[ $HOST == localhost || $HOST == "$(hostname -f)" || $HOST = "$IP" ]];
then
- ${NUMA_CMD} "$COMMAND" "${SERVICE}" --address "${ADDRESS}"
>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out"
2>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err" &
++ ${NUMA_CMD} "$COMMAND" "${SERVICE}" --address "${ADDRESS}"
>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out"
2>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err" &
MAX_FILES_OPEN=$(ulimit -n)
else
- $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address
${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
- MAX_FILES_OPEN=$($SSH $HOST "/usr/bin/env bash -c 'ulimit -n'")
+ $SSH "$HOST" "bash -c 'exec nohup ${NUMA_CMD} $COMMAND ${SERVICE}
--address ${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
- MAX_FILES_OPEN=$($SSH "$HOST" "/usr/bin/env bash -c 'ulimit -n'")
++ MAX_FILES_OPEN=$($SSH "$HOST" "/usr/bin/env bash -c 'ulimit -n'")
fi
if [[ -n $MAX_FILES_OPEN && -n $SLAVES ]] ; then
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1faee537/pom.xml
--
diff --cc pom.xml
index 19ff679,24f25c9..3815ad7
--- a/pom.xml
+++ b/pom.xml
@@@ -95,7 -95,7 +95,7 @@@
scm:git:git://git.apache.org/accumulo.git
scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git
- ${project.version}
-1.7.0
++HEAD
https://git-wip-us.apache.org/repos/asf?p=accumulo.git
[18/21] accumulo git commit: ACCUMULO-3819 Update findbugs and checkstyle tools
ACCUMULO-3819 Update findbugs and checkstyle tools
* Bump findbugs and checkstyle build tools to check for more problems.
* Fix newly detected problems (mainly lack of checking for null when listing
directory contents) to ensure the build passes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b577410c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b577410c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b577410c
Branch: refs/heads/master
Commit: b577410c677b5adb2f1c0eb1c1f8f6a9061cd0ad
Parents: 6524b07
Author: Christopher Tubbs
Authored: Wed May 20 11:50:32 2015 -0400
Committer: Christopher Tubbs
Committed: Wed May 20 11:50:32 2015 -0400
--
.../core/client/impl/ConditionalWriterImpl.java | 2 +-
.../accumulo/core/file/rfile/bcfile/Utils.java | 2 +-
.../iterators/user/IntersectingIterator.java| 19 ++---
.../mapred/AccumuloFileOutputFormatTest.java| 2 +
.../mapreduce/AccumuloFileOutputFormatTest.java | 2 +
.../accumulo/examples/simple/shard/Index.java | 7 +-
.../impl/MiniAccumuloClusterImpl.java | 17 ++--
.../impl/MiniAccumuloConfigImpl.java| 8 +-
pom.xml | 6 +-
.../accumulo/server/util/SendLogToChainsaw.java | 2 +-
.../org/apache/accumulo/monitor/util/Table.java | 2 +-
.../monitor/util/celltypes/NumberType.java | 2 +-
.../accumulo/tserver/log/LocalWALRecovery.java | 75 -
.../accumulo/tserver/tablet/RootFilesTest.java | 7 +-
.../shell/commands/FormatterCommandTest.java| 2 +-
.../start/classloader/AccumuloClassLoader.java | 7 +-
.../classloader/vfs/UniqueFileReplicator.java | 3 +-
.../accumulo/test/continuous/TimeBinner.java| 3 +
.../test/continuous/UndefinedAnalyzer.java | 84 ++--
.../test/functional/CacheTestWriter.java| 3 +
.../apache/accumulo/test/randomwalk/Node.java | 16 ++--
.../apache/accumulo/test/AuditMessageIT.java| 5 +-
22 files changed, 159 insertions(+), 117 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b577410c/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index b8375dc..24040e6 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -182,7 +182,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
@Override
public int compareTo(Delayed o) {
QCMutation oqcm = (QCMutation) o;
- return Long.valueOf(resetTime).compareTo(Long.valueOf(oqcm.resetTime));
+ return Long.compare(resetTime, oqcm.resetTime);
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b577410c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
index 6cb04a1..5e84f10 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
@@ -351,7 +351,7 @@ public final class Utils {
@Override
public int hashCode() {
- return (major << 16 + minor);
+ return ((major << 16) + minor);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b577410c/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
index 63d6a34..e7338f3 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
@@ -232,19 +232,20 @@ public class IntersectingIterator implements
SortedKeyValueIterator {
// If we are past the target, this is a valid result
if (docIDCompare < 0) {
break;
-}
-// if this source is not yet at the currentCQ then advance in this
source
-if (docIDCompare > 0) {
+} else if (docIDCompare > 0) {
+ // if this source is not yet at the currentCQ then advance in thi
[03/21] accumulo git commit: ACCUMULO-3801 moved GarbageCollectionLogger to proper module
ACCUMULO-3801 moved GarbageCollectionLogger to proper module
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c16fd9d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c16fd9d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c16fd9d1
Branch: refs/heads/1.7
Commit: c16fd9d1552085bf135c399e1ca32fad3737edb3
Parents: 4db7766
Author: Keith Turner
Authored: Tue May 12 11:08:53 2015 -0400
Committer: Josh Elser
Committed: Tue May 12 12:00:09 2015 -0400
--
.../server/GarbageCollectionLogger.java | 116 +++
.../server/GarbageCollectionLogger.java | 116 ---
2 files changed, 116 insertions(+), 116 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c16fd9d1/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
new file mode 100644
index 000..389a544
--- /dev/null
+++
b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.server;
+
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.server.util.Halt;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GarbageCollectionLogger {
+ private static final Logger log =
LoggerFactory.getLogger(GarbageCollectionLogger.class);
+
+ private final HashMap prevGcTime = new HashMap();
+ private long lastMemorySize = 0;
+ private long gcTimeIncreasedCount = 0;
+ private static long lastMemoryCheckTime = 0;
+
+ public GarbageCollectionLogger() {}
+
+ public synchronized void logGCInfo(AccumuloConfiguration conf) {
+final long now = System.currentTimeMillis();
+
+List gcmBeans =
ManagementFactory.getGarbageCollectorMXBeans();
+Runtime rt = Runtime.getRuntime();
+
+StringBuilder sb = new StringBuilder("gc");
+
+boolean sawChange = false;
+
+long maxIncreaseInCollectionTime = 0;
+
+for (GarbageCollectorMXBean gcBean : gcmBeans) {
+ Long prevTime = prevGcTime.get(gcBean.getName());
+ long pt = 0;
+ if (prevTime != null) {
+pt = prevTime;
+ }
+
+ long time = gcBean.getCollectionTime();
+
+ if (time - pt != 0) {
+sawChange = true;
+ }
+
+ long increaseInCollectionTime = time - pt;
+ sb.append(String.format(" %s=%,.2f(+%,.2f) secs", gcBean.getName(), time
/ 1000.0, increaseInCollectionTime / 1000.0));
+ maxIncreaseInCollectionTime = Math.max(increaseInCollectionTime,
maxIncreaseInCollectionTime);
+ prevGcTime.put(gcBean.getName(), time);
+}
+
+long mem = rt.freeMemory();
+if (maxIncreaseInCollectionTime == 0) {
+ gcTimeIncreasedCount = 0;
+} else {
+ gcTimeIncreasedCount++;
+ if (gcTimeIncreasedCount > 3 && mem < rt.maxMemory() * 0.05) {
+log.warn("Running low on memory");
+gcTimeIncreasedCount = 0;
+ }
+}
+
+if (mem > lastMemorySize) {
+ sawChange = true;
+}
+
+String sign = "+";
+if (mem - lastMemorySize <= 0) {
+ sign = "";
+}
+
+sb.append(String.format(" freemem=%,d(%s%,d) totalmem=%,d", mem, sign,
(mem - lastMemorySize), rt.totalMemory()));
+
+if (sawChange) {
+ log.debug(sb.toString());
+}
+
+final long keepAliveTimeout =
conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT);
+if (lastMemoryCheckTime > 0 && lastMemoryCheckTime < now) {
+ final long diff = now - lastMemoryCheckTime;
+ if (diff > keepAliveTimeout + 1000) {
+log.warn(String
[21/21] accumulo git commit: Merge branch '1.7'
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/a9d1ad4a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9d1ad4a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9d1ad4a Branch: refs/heads/master Commit: a9d1ad4a7d470071e59382dfad0e10d49c9ee464 Parents: e22103c 1faee53 Author: Christopher Tubbs Authored: Wed May 20 12:09:26 2015 -0400 Committer: Christopher Tubbs Committed: Wed May 20 12:09:26 2015 -0400 -- CHANGES | 1 + assemble/bin/config.sh | 6 +- assemble/bin/start-server.sh| 4 +- .../core/client/impl/ConditionalWriterImpl.java | 2 +- .../accumulo/core/file/rfile/bcfile/Utils.java | 2 +- .../iterators/user/IntersectingIterator.java| 19 ++--- .../mapred/AccumuloFileOutputFormatTest.java| 2 + .../mapreduce/AccumuloFileOutputFormatTest.java | 2 + .../accumulo/examples/simple/shard/Index.java | 7 +- .../impl/MiniAccumuloClusterImpl.java | 17 ++-- .../impl/MiniAccumuloConfigImpl.java| 8 +- pom.xml | 8 +- .../accumulo/server/util/SendLogToChainsaw.java | 2 +- .../org/apache/accumulo/monitor/util/Table.java | 2 +- .../monitor/util/celltypes/NumberType.java | 2 +- .../accumulo/tserver/log/LocalWALRecovery.java | 75 - .../accumulo/tserver/tablet/RootFilesTest.java | 7 +- .../shell/commands/FormatterCommandTest.java| 2 +- .../start/classloader/AccumuloClassLoader.java | 7 +- .../classloader/vfs/UniqueFileReplicator.java | 3 +- .../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/CopyTool.java| 6 +- .../apache/accumulo/test/AuditMessageIT.java| 5 +- 26 files changed, 168 insertions(+), 127 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9d1ad4a/pom.xml --
[02/21] accumulo git commit: Revert "ACCUMULO-3793 use numctl to turn on memory interleaving"
Revert "ACCUMULO-3793 use numctl to turn on memory interleaving"
This reverts commit b82148777c023b21578d06ef451fdd70770107a5.
Conflicts:
assemble/bin/config.sh
assemble/bin/start-server.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4db7766d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4db7766d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4db7766d
Branch: refs/heads/master
Commit: 4db7766d77497c4ab8b8cbd997fe1b4c267308f3
Parents: 8e99ed2
Author: Josh Elser
Authored: Tue May 12 11:59:11 2015 -0400
Committer: Josh Elser
Committed: Tue May 12 11:59:11 2015 -0400
--
assemble/bin/config.sh | 9 -
assemble/bin/start-server.sh | 8
2 files changed, 4 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4db7766d/assemble/bin/config.sh
--
diff --git a/assemble/bin/config.sh b/assemble/bin/config.sh
index ed393bb..d9bf8d4 100755
--- a/assemble/bin/config.sh
+++ b/assemble/bin/config.sh
@@ -104,15 +104,6 @@ then
fi
export HADOOP_PREFIX
-NUMA=`which numactl 2>/dev/null`
-NUMACTL_EXISTS="$?"
-NUMACTL_ARGS="--interleave=all"
-if [[ ${NUMACTL_EXISTS} -eq 0 ]] ; then
- export NUMA_CMD="${NUMA} ${NUMACTL_ARGS}"
-else
- export NUMA_CMD=""
-fi
-
export HADOOP_HOME=$HADOOP_PREFIX
export HADOOP_HOME_WARN_SUPPRESS=true
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4db7766d/assemble/bin/start-server.sh
--
diff --git a/assemble/bin/start-server.sh b/assemble/bin/start-server.sh
index 3587ec9..2fb4c4c 100755
--- a/assemble/bin/start-server.sh
+++ b/assemble/bin/start-server.sh
@@ -77,12 +77,12 @@ if [[ -z "$PID" ]]; then
COMMAND="${bin}/accumulo_watcher.sh ${LOGHOST}"
fi
- if [[ $HOST == localhost || $HOST == "$(hostname -f)" || $HOST = "$IP" ]];
then
- ${NUMA_CMD} "$COMMAND" "${SERVICE}" --address "${ADDRESS}"
>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out"
2>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err" &
+ if [ "$HOST" = "localhost" -o "$HOST" = "`hostname -f`" -o "$HOST" = "$ip"
]; then
+ ${bin}/accumulo ${SERVICE} --address ${ADDRESS}
>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err &
MAX_FILES_OPEN=$(ulimit -n)
else
- $SSH "$HOST" "bash -c 'exec nohup ${NUMA_CMD} $COMMAND ${SERVICE}
--address ${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
- MAX_FILES_OPEN=$($SSH "$HOST" "/usr/bin/env bash -c 'ulimit -n'")
+ $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address
${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
+ MAX_FILES_OPEN=$($SSH $HOST "/usr/bin/env bash -c 'ulimit -n'")
fi
if [[ -n $MAX_FILES_OPEN && -n $SLAVES ]] ; then
[14/21] accumulo git commit: [maven-release-plugin] prepare release 1.7.0
[maven-release-plugin] prepare release 1.7.0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8cba8128 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8cba8128 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8cba8128 Branch: refs/heads/master Commit: 8cba8128fbc3238bdd9398cf5c36b7cb6dc3b61d Parents: 9fda3bb Author: Josh Elser Authored: Tue May 12 14:34:29 2015 -0400 Committer: Josh Elser Committed: Tue May 12 14:34:29 2015 -0400 -- assemble/pom.xml| 2 +- core/pom.xml| 2 +- docs/pom.xml| 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml| 2 +- maven-plugin/pom.xml| 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- proxy/pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml | 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml | 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml| 2 +- trace/pom.xml | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/assemble/pom.xml -- diff --git a/assemble/pom.xml b/assemble/pom.xml index e88cd81..0cf690b 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 12e3c1d..fe91d0a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-core Core http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 47d98da..519f534 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-docs pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/examples/simple/pom.xml -- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index aa2f118..7172831 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 ../../pom.xml accumulo-examples-simple http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/fate/pom.xml -- diff --git a/fate/pom.xml b/fate/pom.xml index 5fd9a7e..e282a14 100644 --- a/fate/pom.xml +++ b/fate/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-fate Fate http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/maven-plugin/pom.xml -- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 2c07d7d..ecb3bd0 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-maven-plugin maven-plugin http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/minicluster/pom.xml -- diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 7644269..c12c967 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-minicluster MiniCluster http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/pom.xml -- diff --git a/pom.xml b/pom.xml index 5bf65e8..24f25c9 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project - 1.7.0-SNAPSHOT + 1.7.0 pom Apache Accumulo Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process. @@
[15/21] accumulo git commit: ACCUMULO-3820 Remove unused variable
ACCUMULO-3820 Remove unused variable
* Remove warning for unused variable.
* Update comment explaining why the parameter wasn't used.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6524b072
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6524b072
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6524b072
Branch: refs/heads/master
Commit: 6524b0720350170696c1692430ad47dd5f4bffd0
Parents: ed5b53b
Author: Christopher Tubbs
Authored: Wed May 20 11:08:07 2015 -0400
Committer: Christopher Tubbs
Committed: Wed May 20 11:08:07 2015 -0400
--
.../apache/accumulo/test/randomwalk/multitable/CopyTool.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6524b072/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
--
diff --git
a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
index b4e509c..251a064 100644
---
a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
+++
b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
@@ -19,9 +19,9 @@ package org.apache.accumulo.test.randomwalk.multitable;
import java.io.IOException;
import org.apache.accumulo.core.client.ClientConfiguration;
+import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
import org.apache.accumulo.core.client.admin.DelegationTokenConfig;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
@@ -74,9 +74,7 @@ public class CopyTool extends Configured implements Tool {
final AuthenticationToken token;
if
(clientConf.getBoolean(ClientProperty.INSTANCE_RPC_SASL_ENABLED.getKey(),
false)) {
// Use the Kerberos creds to request a DelegationToken for MapReduce to
use
- final String keytab = args[1];
-
- // Better be logged in. Could use the keytab, but we're already logged
in soo..
+ // We could use the specified keytab (args[1]), but we're already logged
in and don't need to, so we can just use the current user
KerberosToken kt = new KerberosToken();
try {
UserGroupInformation user = UserGroupInformation.getCurrentUser();
[09/21] accumulo git commit: ACCUMULO-3803 Resurected mapreduce.lib.util
ACCUMULO-3803 Resurected mapreduce.lib.util
Ran the following command in the 1.7 branch to do this. The commit below is
what was at head of the 1.6 branch at the time I ran this command.
git checkout c4eff0c2eb1320e411ac3e41b6f2db89c2d3ba33 --
core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util
I checked in the 1.6 branch and found that this code has no references (like
test).
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0d9c05e7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0d9c05e7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0d9c05e7
Branch: refs/heads/1.7
Commit: 0d9c05e716774f7904c7da2664063a778ab4640b
Parents: eef4dfe
Author: Keith Turner
Authored: Tue May 12 12:51:18 2015 -0400
Committer: Josh Elser
Committed: Tue May 12 13:40:37 2015 -0400
--
.../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 +
5 files changed, 1127 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0d9c05e7/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
new file mode 100644
index 000..20fbbea
--- /dev/null
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
@@ -0,0 +1,277 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.client.mapreduce.lib.util;
+
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.ClientConfiguration;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.mock.MockInstance;
+import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
+import
org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.StringUtils;
+import org.apache.log4j.Level;
+
+/**
+ * @deprecated since 1.6.0; Configure your job with the appropriate
InputFormat or OutputFormat.
+ * @since 1.5.0
+ */
+@Deprecated
+public class ConfiguratorBase {
+
+ /**
+ * Configuration keys for {@link Instance#getConnector(String,
AuthenticationToken)}.
+ *
+ * @deprecated since 1.6.0; Configure your job with the appropriate
InputFormat or OutputFormat.
+ * @since 1.5.0
+ */
+ @Deprecated
+ public static enum ConnectorInfo {
+IS_CONFIGURED, PRINCIPAL, TOKEN, TOKEN_CLASS
+ }
+
+ /**
+ * Configuration keys for {@link Instance}, {@link ZooKeeperInstance}, and
{@link MockInstance}.
+ *
+ * @deprecated since 1.6.0; Configure your job with the appropriate
InputFormat or OutputFormat.
+ * @since 1.5.0
+ */
+ @Deprecated
+ protected static enum InstanceOpts {
+TYPE, NAME, ZOO_KEEPERS;
+ }
+
+ /**
+ * Configuration keys for general configuration options.
+ *
+ * @deprecated since 1.6.0; Configure your job with the appropriate
InputFormat or OutputFormat.
+ * @since 1.5.0
+ */
+ @Deprecated
+ protected static enum GeneralOpts {
+LOG_LEVEL
+ }
+
+ /**
+ * Provides a configuration key for a given feature enum, prefixed by the
implementingClass
+ *
+ * @param implementingClass
+ * the class whose name will be used as a prefix for the property
configuration key
+ * @param e
+ * the enum used to provide the unique part of the configuration key
+ * @return the configuration key
+ * @deprecate
[20/21] accumulo git commit: Merge tag '1.7.0' into 1.7
Merge tag '1.7.0' into 1.7
Apache Accumulo 1.7.0
Conflicts:
assemble/pom.xml
core/pom.xml
docs/pom.xml
examples/simple/pom.xml
fate/pom.xml
maven-plugin/pom.xml
minicluster/pom.xml
pom.xml
proxy/pom.xml
server/base/pom.xml
server/gc/pom.xml
server/master/pom.xml
server/monitor/pom.xml
server/native/pom.xml
server/tracer/pom.xml
server/tserver/pom.xml
shell/pom.xml
start/pom.xml
test/pom.xml
trace/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1faee537
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1faee537
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1faee537
Branch: refs/heads/master
Commit: 1faee537d8d557297d20f3d084b4e16127d00600
Parents: b577410 8cba812
Author: Christopher Tubbs
Authored: Wed May 20 12:07:59 2015 -0400
Committer: Christopher Tubbs
Committed: Wed May 20 12:07:59 2015 -0400
--
CHANGES | 1 +
assemble/bin/config.sh | 6 +++---
assemble/bin/start-server.sh | 4 ++--
pom.xml | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1faee537/assemble/bin/config.sh
--
diff --cc assemble/bin/config.sh
index ed393bb,d9bf8d4..9dfd164
--- a/assemble/bin/config.sh
+++ b/assemble/bin/config.sh
@@@ -104,15 -104,6 +104,15 @@@ the
fi
export HADOOP_PREFIX
- NUMA=`which numactl 2>/dev/null`
- NUMACTL_EXISTS="$?"
- NUMACTL_ARGS="--interleave=all"
++NUMA=$(which numactl 2>/dev/null)
++NUMACTL_EXISTS=$?
++NUMACTL_ARGS='--interleave=all'
+if [[ ${NUMACTL_EXISTS} -eq 0 ]] ; then
+ export NUMA_CMD="${NUMA} ${NUMACTL_ARGS}"
+else
+ export NUMA_CMD=""
+fi
+
export HADOOP_HOME=$HADOOP_PREFIX
export HADOOP_HOME_WARN_SUPPRESS=true
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1faee537/assemble/bin/start-server.sh
--
diff --cc assemble/bin/start-server.sh
index 3587ec9,2fb4c4c..8266457
--- a/assemble/bin/start-server.sh
+++ b/assemble/bin/start-server.sh
@@@ -77,12 -77,12 +77,12 @@@ if [[ -z "$PID" ]]; the
COMMAND="${bin}/accumulo_watcher.sh ${LOGHOST}"
fi
- if [ "$HOST" = "localhost" -o "$HOST" = "`hostname -f`" -o "$HOST" = "$ip"
]; then
- ${bin}/accumulo ${SERVICE} --address ${ADDRESS}
>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err &
+ if [[ $HOST == localhost || $HOST == "$(hostname -f)" || $HOST = "$IP" ]];
then
- ${NUMA_CMD} "$COMMAND" "${SERVICE}" --address "${ADDRESS}"
>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out"
2>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err" &
++ ${NUMA_CMD} "$COMMAND" "${SERVICE}" --address "${ADDRESS}"
>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out"
2>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err" &
MAX_FILES_OPEN=$(ulimit -n)
else
- $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address
${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
- MAX_FILES_OPEN=$($SSH $HOST "/usr/bin/env bash -c 'ulimit -n'")
+ $SSH "$HOST" "bash -c 'exec nohup ${NUMA_CMD} $COMMAND ${SERVICE}
--address ${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
- MAX_FILES_OPEN=$($SSH "$HOST" "/usr/bin/env bash -c 'ulimit -n'")
++ MAX_FILES_OPEN=$($SSH "$HOST" "/usr/bin/env bash -c 'ulimit -n'")
fi
if [[ -n $MAX_FILES_OPEN && -n $SLAVES ]] ; then
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1faee537/pom.xml
--
diff --cc pom.xml
index 19ff679,24f25c9..3815ad7
--- a/pom.xml
+++ b/pom.xml
@@@ -95,7 -95,7 +95,7 @@@
scm:git:git://git.apache.org/accumulo.git
scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git
- ${project.version}
-1.7.0
++HEAD
https://git-wip-us.apache.org/repos/asf?p=accumulo.git
[12/21] accumulo git commit: ACCUMULO-3743 One more CHANGES change.
ACCUMULO-3743 One more CHANGES change. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9fda3bbb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9fda3bbb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9fda3bbb Branch: refs/heads/master Commit: 9fda3bbb2c5a06764412c2ed665e47e75a9762da Parents: 0d9c05e Author: Josh Elser Authored: Tue May 12 13:42:23 2015 -0400 Committer: Josh Elser Committed: Tue May 12 13:42:23 2015 -0400 -- CHANGES | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9fda3bbb/CHANGES -- diff --git a/CHANGES b/CHANGES index 7750d66..d966db4 100644 --- a/CHANGES +++ b/CHANGES @@ -474,6 +474,7 @@ Release Notes - Accumulo - Version 1.7.0 * [ACCUMULO-3791] - Agitator start/stop scripts collide variable names * [ACCUMULO-3792] - org.apache.accumulo.test.randomwalk.Node#getMapReduceJars needs to include htrace * [ACCUMULO-3800] - Extra DEPENDENCIES file after new apache.pom +* [ACCUMULO-3803] - Resurrect mapreduce.lib.util for 1.7.0 ** Improvement * [ACCUMULO-898] - look into replacing cloudtrace
[06/21] accumulo git commit: Revert "ACCUMULO-3800 Add exclusion for DEPENDENCIES"
Revert "ACCUMULO-3800 Add exclusion for DEPENDENCIES" This reverts commit 8e99ed222db49e0f9a4f03ae90d1cbcf44bb1a87. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc1d0def Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc1d0def Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc1d0def Branch: refs/heads/master Commit: dc1d0defb79b5fde68631f1063be021fb3420f74 Parents: c16fd9d Author: Christopher Tubbs Authored: Tue May 12 11:42:12 2015 -0400 Committer: Josh Elser Committed: Tue May 12 12:44:01 2015 -0400 -- pom.xml | 9 - 1 file changed, 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/dc1d0def/pom.xml -- diff --git a/pom.xml b/pom.xml index f4c734b..5bf65e8 100644 --- a/pom.xml +++ b/pom.xml @@ -955,15 +955,6 @@ - - org.apache.rat - apache-rat-plugin - - - DEPENDENCIES - - -
[13/21] accumulo git commit: [maven-release-plugin] prepare release 1.7.0
[maven-release-plugin] prepare release 1.7.0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8cba8128 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8cba8128 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8cba8128 Branch: refs/heads/1.7 Commit: 8cba8128fbc3238bdd9398cf5c36b7cb6dc3b61d Parents: 9fda3bb Author: Josh Elser Authored: Tue May 12 14:34:29 2015 -0400 Committer: Josh Elser Committed: Tue May 12 14:34:29 2015 -0400 -- assemble/pom.xml| 2 +- core/pom.xml| 2 +- docs/pom.xml| 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml| 2 +- maven-plugin/pom.xml| 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- proxy/pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml | 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml | 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml| 2 +- trace/pom.xml | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/assemble/pom.xml -- diff --git a/assemble/pom.xml b/assemble/pom.xml index e88cd81..0cf690b 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 12e3c1d..fe91d0a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-core Core http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 47d98da..519f534 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-docs pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/examples/simple/pom.xml -- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index aa2f118..7172831 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 ../../pom.xml accumulo-examples-simple http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/fate/pom.xml -- diff --git a/fate/pom.xml b/fate/pom.xml index 5fd9a7e..e282a14 100644 --- a/fate/pom.xml +++ b/fate/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-fate Fate http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/maven-plugin/pom.xml -- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 2c07d7d..ecb3bd0 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-maven-plugin maven-plugin http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/minicluster/pom.xml -- diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 7644269..c12c967 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.0-SNAPSHOT +1.7.0 accumulo-minicluster MiniCluster http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cba8128/pom.xml -- diff --git a/pom.xml b/pom.xml index 5bf65e8..24f25c9 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project - 1.7.0-SNAPSHOT + 1.7.0 pom Apache Accumulo Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process. @@ -95
[10/21] accumulo git commit: ACCUMULO-3803 Resurected mapreduce.lib.util
ACCUMULO-3803 Resurected mapreduce.lib.util
Ran the following command in the 1.7 branch to do this. The commit below is
what was at head of the 1.6 branch at the time I ran this command.
git checkout c4eff0c2eb1320e411ac3e41b6f2db89c2d3ba33 --
core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util
I checked in the 1.6 branch and found that this code has no references (like
test).
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0d9c05e7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0d9c05e7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0d9c05e7
Branch: refs/heads/master
Commit: 0d9c05e716774f7904c7da2664063a778ab4640b
Parents: eef4dfe
Author: Keith Turner
Authored: Tue May 12 12:51:18 2015 -0400
Committer: Josh Elser
Committed: Tue May 12 13:40:37 2015 -0400
--
.../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 +
5 files changed, 1127 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0d9c05e7/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
new file mode 100644
index 000..20fbbea
--- /dev/null
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
@@ -0,0 +1,277 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.client.mapreduce.lib.util;
+
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.ClientConfiguration;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.mock.MockInstance;
+import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
+import
org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.StringUtils;
+import org.apache.log4j.Level;
+
+/**
+ * @deprecated since 1.6.0; Configure your job with the appropriate
InputFormat or OutputFormat.
+ * @since 1.5.0
+ */
+@Deprecated
+public class ConfiguratorBase {
+
+ /**
+ * Configuration keys for {@link Instance#getConnector(String,
AuthenticationToken)}.
+ *
+ * @deprecated since 1.6.0; Configure your job with the appropriate
InputFormat or OutputFormat.
+ * @since 1.5.0
+ */
+ @Deprecated
+ public static enum ConnectorInfo {
+IS_CONFIGURED, PRINCIPAL, TOKEN, TOKEN_CLASS
+ }
+
+ /**
+ * Configuration keys for {@link Instance}, {@link ZooKeeperInstance}, and
{@link MockInstance}.
+ *
+ * @deprecated since 1.6.0; Configure your job with the appropriate
InputFormat or OutputFormat.
+ * @since 1.5.0
+ */
+ @Deprecated
+ protected static enum InstanceOpts {
+TYPE, NAME, ZOO_KEEPERS;
+ }
+
+ /**
+ * Configuration keys for general configuration options.
+ *
+ * @deprecated since 1.6.0; Configure your job with the appropriate
InputFormat or OutputFormat.
+ * @since 1.5.0
+ */
+ @Deprecated
+ protected static enum GeneralOpts {
+LOG_LEVEL
+ }
+
+ /**
+ * Provides a configuration key for a given feature enum, prefixed by the
implementingClass
+ *
+ * @param implementingClass
+ * the class whose name will be used as a prefix for the property
configuration key
+ * @param e
+ * the enum used to provide the unique part of the configuration key
+ * @return the configuration key
+ * @deprec
svn commit: r1680599 - /accumulo/site/trunk/content/release_notes/1.7.0.mdtext
Author: ctubbsii Date: Wed May 20 15:17:49 2015 New Revision: 1680599 URL: http://svn.apache.org/r1680599 Log: Minor punctuation, typo fix in new paragraph. Modified: accumulo/site/trunk/content/release_notes/1.7.0.mdtext Modified: accumulo/site/trunk/content/release_notes/1.7.0.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.7.0.mdtext?rev=1680599&r1=1680598&r2=1680599&view=diff == --- accumulo/site/trunk/content/release_notes/1.7.0.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.7.0.mdtext Wed May 20 15:17:49 2015 @@ -310,10 +310,10 @@ subset of all tables. ## Table and namespace custom properties ## -Inorder to avoid errors caused by mis-typed configuration properties, Accumulo was strict about which configuration properties -could be set. However this prevented user from setting arbitrary properties that could be used by custom balancers, compaction -strategies, volume choosers, and iterators. Under [ACCUMULO-2841][ACCUMULO-2841] the ability to set arbitrary table and -namespace properties was added. The properties need to be prefixed with `table.custom`. The changes made in +In order to avoid errors caused by mis-typed configuration properties, Accumulo was strict about which configuration properties +could be set. However, this prevented users from setting arbitrary properties that could be used by custom balancers, compaction +strategies, volume choosers, and iterators. Under [ACCUMULO-2841][ACCUMULO-2841], the ability to set arbitrary table and +namespace properties was added. The properties need to be prefixed with `table.custom.`. The changes made in [ACCUMULO-3177][ACCUMULO-3177] and [ACCUMULO-3439][ACCUMULO-3439] leverage this new feature. # Notable Bug Fixes #
svn commit: r952049 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.7.0.html
Author: buildbot Date: Wed May 20 15:17:55 2015 New Revision: 952049 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/release_notes/1.7.0.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed May 20 15:17:55 2015 @@ -1 +1 @@ -1680588 +1680599 Modified: websites/staging/accumulo/trunk/content/release_notes/1.7.0.html == --- websites/staging/accumulo/trunk/content/release_notes/1.7.0.html (original) +++ websites/staging/accumulo/trunk/content/release_notes/1.7.0.html Wed May 20 15:17:55 2015 @@ -456,10 +456,10 @@ introduces a new per-table property whic utilization happens when multiple are available is limited to the expected subset of all tables. Table and namespace custom properties -Inorder to avoid errors caused by mis-typed configuration properties, Accumulo was strict about which configuration properties -could be set. However this prevented user from setting arbitrary properties that could be used by custom balancers, compaction -strategies, volume choosers, and iterators. Under https://issues.apache.org/jira/browse/ACCUMULO-2841";>ACCUMULO-2841 the ability to set arbitrary table and -namespace properties was added. The properties need to be prefixed with table.custom. The changes made in +In order to avoid errors caused by mis-typed configuration properties, Accumulo was strict about which configuration properties +could be set. However, this prevented users from setting arbitrary properties that could be used by custom balancers, compaction +strategies, volume choosers, and iterators. Under https://issues.apache.org/jira/browse/ACCUMULO-2841";>ACCUMULO-2841, the ability to set arbitrary table and +namespace properties was added. The properties need to be prefixed with table.custom.. The changes made in https://issues.apache.org/jira/browse/ACCUMULO-3177";>ACCUMULO-3177 and https://issues.apache.org/jira/browse/ACCUMULO-3439";>ACCUMULO-3439 leverage this new feature. Notable Bug Fixes SourceSwitchingIterator Deadlock
svn commit: r952047 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/ 1.7/apidocs/
Author: kturner Date: Wed May 20 14:58:01 2015 New Revision: 952047 Log: Publishing svnmucc operation to accumulo site by kturner Added: websites/production/accumulo/content/ - copied from r952046, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r952046, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r952046, websites/production/accumulo/content/1.5/apidocs/ websites/production/accumulo/content/1.6/apidocs/ - copied from r952046, websites/production/accumulo/content/1.6/apidocs/ websites/production/accumulo/content/1.7/apidocs/ - copied from r952046, websites/production/accumulo/content/1.7/apidocs/
svn commit: r952046 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.7.0.html
Author: buildbot Date: Wed May 20 14:57:06 2015 New Revision: 952046 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/release_notes/1.7.0.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed May 20 14:57:06 2015 @@ -1 +1 @@ -1680587 +1680588 Modified: websites/staging/accumulo/trunk/content/release_notes/1.7.0.html == --- websites/staging/accumulo/trunk/content/release_notes/1.7.0.html (original) +++ websites/staging/accumulo/trunk/content/release_notes/1.7.0.html Wed May 20 14:57:06 2015 @@ -455,7 +455,7 @@ introduces a new per-table property whic VolumeChooser. This ensures that the implementation to choose how HDFS utilization happens when multiple are available is limited to the expected subset of all tables. -Table and namespace custom properties +Table and namespace custom properties Inorder to avoid errors caused by mis-typed configuration properties, Accumulo was strict about which configuration properties could be set. However this prevented user from setting arbitrary properties that could be used by custom balancers, compaction strategies, volume choosers, and iterators. Under https://issues.apache.org/jira/browse/ACCUMULO-2841";>ACCUMULO-2841 the ability to set arbitrary table and
svn commit: r1680588 - /accumulo/site/trunk/content/release_notes/1.7.0.mdtext
Author: kturner Date: Wed May 20 14:57:00 2015 New Revision: 1680588 URL: http://svn.apache.org/r1680588 Log: ACCUMULO-3737 Fix header Modified: accumulo/site/trunk/content/release_notes/1.7.0.mdtext Modified: accumulo/site/trunk/content/release_notes/1.7.0.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.7.0.mdtext?rev=1680588&r1=1680587&r2=1680588&view=diff == --- accumulo/site/trunk/content/release_notes/1.7.0.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.7.0.mdtext Wed May 20 14:57:00 2015 @@ -308,7 +308,7 @@ introduces a new per-table property whic utilization happens when multiple are available is limited to the expected subset of all tables. -### Table and namespace custom properties +## Table and namespace custom properties ## Inorder to avoid errors caused by mis-typed configuration properties, Accumulo was strict about which configuration properties could be set. However this prevented user from setting arbitrary properties that could be used by custom balancers, compaction
svn commit: r1680587 - /accumulo/site/trunk/content/release_notes/1.7.0.mdtext
Author: kturner Date: Wed May 20 14:55:42 2015 New Revision: 1680587 URL: http://svn.apache.org/r1680587 Log: ACCUMULO-3737 added info about ACCUMULO-2841 to 1.7.0 release notes. Modified: accumulo/site/trunk/content/release_notes/1.7.0.mdtext Modified: accumulo/site/trunk/content/release_notes/1.7.0.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.7.0.mdtext?rev=1680587&r1=1680586&r2=1680587&view=diff == --- accumulo/site/trunk/content/release_notes/1.7.0.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.7.0.mdtext Wed May 20 14:55:42 2015 @@ -308,6 +308,14 @@ introduces a new per-table property whic utilization happens when multiple are available is limited to the expected subset of all tables. +### Table and namespace custom properties + +Inorder to avoid errors caused by mis-typed configuration properties, Accumulo was strict about which configuration properties +could be set. However this prevented user from setting arbitrary properties that could be used by custom balancers, compaction +strategies, volume choosers, and iterators. Under [ACCUMULO-2841][ACCUMULO-2841] the ability to set arbitrary table and +namespace properties was added. The properties need to be prefixed with `table.custom`. The changes made in +[ACCUMULO-3177][ACCUMULO-3177] and [ACCUMULO-3439][ACCUMULO-3439] leverage this new feature. + # Notable Bug Fixes # ## SourceSwitchingIterator Deadlock ## @@ -418,6 +426,7 @@ Accumulo configuration from `120s` to `2 [ACCUMULO-1957]: https://issues.apache.org/jira/browse/ACCUMULO-1957 [ACCUMULO-2388]: https://issues.apache.org/jira/browse/ACCUMULO-2388 [ACCUMULO-2815]: https://issues.apache.org/jira/browse/ACCUMULO-2815 +[ACCUMULO-2841]: https://issues.apache.org/jira/browse/ACCUMULO-2841 [ACCUMULO-2863]: https://issues.apache.org/jira/browse/ACCUMULO-2863 [ACCUMULO-2998]: https://issues.apache.org/jira/browse/ACCUMULO-2998 [ACCUMULO-3134]: https://issues.apache.org/jira/browse/ACCUMULO-3134
svn commit: r952045 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.7.0.html
Author: buildbot Date: Wed May 20 14:55:51 2015 New Revision: 952045 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/release_notes/1.7.0.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed May 20 14:55:51 2015 @@ -1 +1 @@ -1680535 +1680587 Modified: websites/staging/accumulo/trunk/content/release_notes/1.7.0.html == --- websites/staging/accumulo/trunk/content/release_notes/1.7.0.html (original) +++ websites/staging/accumulo/trunk/content/release_notes/1.7.0.html Wed May 20 14:55:51 2015 @@ -455,6 +455,12 @@ introduces a new per-table property whic VolumeChooser. This ensures that the implementation to choose how HDFS utilization happens when multiple are available is limited to the expected subset of all tables. +Table and namespace custom properties +Inorder to avoid errors caused by mis-typed configuration properties, Accumulo was strict about which configuration properties +could be set. However this prevented user from setting arbitrary properties that could be used by custom balancers, compaction +strategies, volume choosers, and iterators. Under https://issues.apache.org/jira/browse/ACCUMULO-2841";>ACCUMULO-2841 the ability to set arbitrary table and +namespace properties was added. The properties need to be prefixed with table.custom. The changes made in +https://issues.apache.org/jira/browse/ACCUMULO-3177";>ACCUMULO-3177 and https://issues.apache.org/jira/browse/ACCUMULO-3439";>ACCUMULO-3439 leverage this new feature. Notable Bug Fixes SourceSwitchingIterator Deadlock An instance of SourceSwitchingIterator, the Accumulo iterator which
svn commit: r952024 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/ 1.7/apidocs/
Author: ecn Date: Wed May 20 12:10:29 2015 New Revision: 952024 Log: Publishing svnmucc operation to accumulo site by ecn Added: websites/production/accumulo/content/ - copied from r952023, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r952023, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r952023, websites/production/accumulo/content/1.5/apidocs/ websites/production/accumulo/content/1.6/apidocs/ - copied from r952023, websites/production/accumulo/content/1.6/apidocs/ websites/production/accumulo/content/1.7/apidocs/ - copied from r952023, websites/production/accumulo/content/1.7/apidocs/
svn commit: r952022 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.7.0.html
Author: buildbot Date: Wed May 20 12:10:02 2015 New Revision: 952022 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/release_notes/1.7.0.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed May 20 12:10:02 2015 @@ -1 +1 @@ -1680454 +1680535 Modified: websites/staging/accumulo/trunk/content/release_notes/1.7.0.html == --- websites/staging/accumulo/trunk/content/release_notes/1.7.0.html (original) +++ websites/staging/accumulo/trunk/content/release_notes/1.7.0.html Wed May 20 12:10:02 2015 @@ -343,19 +343,12 @@ using Accumulo's public API. The regular https://github.com/apache/accumulo/blob/1.7.0/README.md#api";>README. Performance Improvements Configurable Threadpool Size for Assignments -One of the primary tasks that the Accumulo Master is responsible for is the -assignment of tablets to tablet servers. Before a tablet can be brought -online, it must not have any outstanding logs because this represents a need -to perform recovery (the tablet was not unloaded cleanly). This process can -take some time for large write-ahead log files, so it is performed on a tablet -server to keep the Master light and agile. -Assignments, whether the tablets need to perform recovery or not, share the -same threadpool in the Master. This means that when a large number of tablet -servers are available, too few threads dedicated to assignment can restrict -the speed at which assignments can be performed. -https://issues.apache.org/jira/browse/ACCUMULO-1085";>ACCUMULO-1085 allows the size of the threadpool used in the -Master for assignments to be configurable which can be dynamically altered to -remove the limitation when sufficient servers are available. +During start-up, the Master quickly assigns tablets to Tablet Servers. However, +Tablet Servers load those assigned tablets one at a time. In 1.7, the servers +will be more aggressive, and will load tablets in parallel, so long as they do +not have mutations that need to be recovered. +https://issues.apache.org/jira/browse/ACCUMULO-1085";>ACCUMULO-1085 allows the size of the threadpool used in the Tablet Servers +for assignment processing to be configurable. Group-Commit Threshold as a Factor of Data Size When ingesting data into Accumulo, the majority of time is spent in the write-ahead log. As such, this is a common place that optimizations are added.
svn commit: r1680535 - /accumulo/site/trunk/content/release_notes/1.7.0.mdtext
Author: ecn Date: Wed May 20 12:09:53 2015 New Revision: 1680535 URL: http://svn.apache.org/r1680535 Log: CMS commit to accumulo by ecn Modified: accumulo/site/trunk/content/release_notes/1.7.0.mdtext Modified: accumulo/site/trunk/content/release_notes/1.7.0.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.7.0.mdtext?rev=1680535&r1=1680534&r2=1680535&view=diff == --- accumulo/site/trunk/content/release_notes/1.7.0.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.7.0.mdtext Wed May 20 12:09:53 2015 @@ -168,20 +168,13 @@ using Accumulo's public API. The regular ## Configurable Threadpool Size for Assignments ## -One of the primary tasks that the Accumulo Master is responsible for is the -assignment of tablets to tablet servers. Before a tablet can be brought -online, it must not have any outstanding logs because this represents a need -to perform recovery (the tablet was not unloaded cleanly). This process can -take some time for large write-ahead log files, so it is performed on a tablet -server to keep the Master light and agile. +During start-up, the Master quickly assigns tablets to Tablet Servers. However, +Tablet Servers load those assigned tablets one at a time. In 1.7, the servers +will be more aggressive, and will load tablets in parallel, so long as they do +not have mutations that need to be recovered. -Assignments, whether the tablets need to perform recovery or not, share the -same threadpool in the Master. This means that when a large number of tablet -servers are available, too few threads dedicated to assignment can restrict -the speed at which assignments can be performed. -[ACCUMULO-1085][ACCUMULO-1085] allows the size of the threadpool used in the -Master for assignments to be configurable which can be dynamically altered to -remove the limitation when sufficient servers are available. +[ACCUMULO-1085] allows the size of the threadpool used in the Tablet Servers +for assignment processing to be configurable. ## Group-Commit Threshold as a Factor of Data Size ##
