You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/02/10 19:05:58 UTC
[1/6] accumulo git commit: ACCUMULO-4139 Fix ExistingMacIT test bug
Repository: accumulo
Updated Branches:
refs/heads/1.6 95f5affb8 -> d36e317a8
refs/heads/1.7 c85e04f5e -> a2b15bfa9
refs/heads/master de5041695 -> 8949fd460
ACCUMULO-4139 Fix ExistingMacIT test bug
Make ExistingMacIT wait the full ZK timeout (plus half a second) based on mini's
configured ZK timeout value.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d36e317a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d36e317a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d36e317a
Branch: refs/heads/1.6
Commit: d36e317a83765984cb83aee27b7616bb2aee226d
Parents: 95f5aff
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Feb 10 12:58:07 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Feb 10 12:58:07 2016 -0500
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d36e317a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
index 323888a..bef2486 100644
--- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
@@ -29,6 +29,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
@@ -100,7 +101,8 @@ public class ExistingMacIT extends ConfigurableMacIT {
}
// TODO clean out zookeeper? following sleep waits for ephemeral nodes to go away
- UtilWaitThread.sleep(10000);
+ long zkTimeout = AccumuloConfiguration.getTimeInMillis(getCluster().getConfig().getSiteConfig().get(Property.INSTANCE_ZK_TIMEOUT.getKey()));
+ UtilWaitThread.sleep(zkTimeout + 500);
File hadoopConfDir = createTestDir(ExistingMacIT.class.getSimpleName() + "_hadoop_conf");
FileUtils.deleteQuietly(hadoopConfDir);
[6/6] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
Merge branch '1.7'
Conflicts:
test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8949fd46
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8949fd46
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8949fd46
Branch: refs/heads/master
Commit: 8949fd460ff54ce6b5a70701da3a860ac7c0221c
Parents: de50416 a2b15bf
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Feb 10 13:05:13 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Feb 10 13:05:13 2016 -0500
----------------------------------------------------------------------
test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8949fd46/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
index 7984393,0000000..9a72051
mode 100644,000000..100644
--- a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
@@@ -1,171 -1,0 +1,173 @@@
+/*
+ * 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.test;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Collection;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.BatchWriterConfig;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
++import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.RootTable;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.minicluster.ServerType;
+import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
+import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
+import org.apache.accumulo.minicluster.impl.ProcessReference;
+import org.apache.accumulo.test.functional.ConfigurableMacBase;
+import org.apache.commons.io.FileUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.RawLocalFileSystem;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+
+public class ExistingMacIT extends ConfigurableMacBase {
+ @Override
+ public int defaultTimeoutSeconds() {
+ return 2 * 60;
+ }
+
+ @Override
+ public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s");
+
+ // use raw local file system so walogs sync and flush will work
+ hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
+ }
+
+ private void createEmptyConfig(File confFile) throws IOException {
+ Configuration conf = new Configuration(false);
+ OutputStream hcOut = new FileOutputStream(confFile);
+ conf.writeXml(hcOut);
+ hcOut.close();
+ }
+
+ @Test
+ public void testExistingInstance() throws Exception {
+
+ Connector conn = getCluster().getConnector("root", new PasswordToken(ROOT_PASSWORD));
+
+ conn.tableOperations().create("table1");
+
+ BatchWriter bw = conn.createBatchWriter("table1", new BatchWriterConfig());
+
+ Mutation m1 = new Mutation("00081");
+ m1.put("math", "sqroot", "9");
+ m1.put("math", "sq", "6560");
+
+ bw.addMutation(m1);
+ bw.close();
+
+ conn.tableOperations().flush("table1", null, null, true);
+ // TOOD use constants
+ conn.tableOperations().flush(MetadataTable.NAME, null, null, true);
+ conn.tableOperations().flush(RootTable.NAME, null, null, true);
+
+ Set<Entry<ServerType,Collection<ProcessReference>>> procs = getCluster().getProcesses().entrySet();
+ for (Entry<ServerType,Collection<ProcessReference>> entry : procs) {
+ if (entry.getKey() == ServerType.ZOOKEEPER)
+ continue;
+ for (ProcessReference pr : entry.getValue())
+ getCluster().killProcess(entry.getKey(), pr);
+ }
+
+ // TODO clean out zookeeper? following sleep waits for ephemeral nodes to go away
- sleepUninterruptibly(10, TimeUnit.SECONDS);
++ long zkTimeout = AccumuloConfiguration.getTimeInMillis(getCluster().getConfig().getSiteConfig().get(Property.INSTANCE_ZK_TIMEOUT.getKey()));
++ sleepUninterruptibly(zkTimeout + 500, TimeUnit.MILLISECONDS);
+
+ File hadoopConfDir = createTestDir(ExistingMacIT.class.getSimpleName() + "_hadoop_conf");
+ FileUtils.deleteQuietly(hadoopConfDir);
+ assertTrue(hadoopConfDir.mkdirs());
+ createEmptyConfig(new File(hadoopConfDir, "core-site.xml"));
+ createEmptyConfig(new File(hadoopConfDir, "hdfs-site.xml"));
+
+ File testDir2 = createTestDir(ExistingMacIT.class.getSimpleName() + "_2");
+ FileUtils.deleteQuietly(testDir2);
+
+ MiniAccumuloConfigImpl macConfig2 = new MiniAccumuloConfigImpl(testDir2, "notused");
+ macConfig2.useExistingInstance(new File(getCluster().getConfig().getConfDir(), "accumulo-site.xml"), hadoopConfDir);
+
+ MiniAccumuloClusterImpl accumulo2 = new MiniAccumuloClusterImpl(macConfig2);
+ accumulo2.start();
+
+ conn = accumulo2.getConnector("root", new PasswordToken(ROOT_PASSWORD));
+
+ Scanner scanner = conn.createScanner("table1", Authorizations.EMPTY);
+
+ int sum = 0;
+ for (Entry<Key,Value> entry : scanner) {
+ sum += Integer.parseInt(entry.getValue().toString());
+ }
+
+ Assert.assertEquals(6569, sum);
+
+ accumulo2.stop();
+ }
+
+ @Test
+ public void testExistingRunningInstance() throws Exception {
+ final String table = getUniqueNames(1)[0];
+ Connector conn = getConnector();
+ // Ensure that a master and tserver are up so the existing instance check won't fail.
+ conn.tableOperations().create(table);
+ BatchWriter bw = conn.createBatchWriter(table, new BatchWriterConfig());
+ Mutation m = new Mutation("foo");
+ m.put("cf", "cq", "value");
+ bw.addMutation(m);
+ bw.close();
+
+ File hadoopConfDir = createTestDir(ExistingMacIT.class.getSimpleName() + "_hadoop_conf_2");
+ FileUtils.deleteQuietly(hadoopConfDir);
+ assertTrue(hadoopConfDir.mkdirs());
+ createEmptyConfig(new File(hadoopConfDir, "core-site.xml"));
+ createEmptyConfig(new File(hadoopConfDir, "hdfs-site.xml"));
+
+ File testDir2 = createTestDir(ExistingMacIT.class.getSimpleName() + "_3");
+ FileUtils.deleteQuietly(testDir2);
+
+ MiniAccumuloConfigImpl macConfig2 = new MiniAccumuloConfigImpl(testDir2, "notused");
+ macConfig2.useExistingInstance(new File(getCluster().getConfig().getConfDir(), "accumulo-site.xml"), hadoopConfDir);
+
+ System.out.println("conf " + new File(getCluster().getConfig().getConfDir(), "accumulo-site.xml"));
+
+ MiniAccumuloClusterImpl accumulo2 = new MiniAccumuloClusterImpl(macConfig2);
+ try {
+ accumulo2.start();
+ Assert.fail("A 2nd MAC instance should not be able to start over an existing MAC instance");
+ } catch (RuntimeException e) {
+ // TODO check message or throw more explicit exception
+ }
+ }
+}
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a2b15bfa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a2b15bfa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a2b15bfa
Branch: refs/heads/1.7
Commit: a2b15bfa9937f7a2c9106323d4216c562f6d6e02
Parents: c85e04f d36e317
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Feb 10 13:02:23 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Feb 10 13:02:23 2016 -0500
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a2b15bfa/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
[2/6] accumulo git commit: ACCUMULO-4139 Fix ExistingMacIT test bug
Posted by ct...@apache.org.
ACCUMULO-4139 Fix ExistingMacIT test bug
Make ExistingMacIT wait the full ZK timeout (plus half a second) based on mini's
configured ZK timeout value.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d36e317a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d36e317a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d36e317a
Branch: refs/heads/1.7
Commit: d36e317a83765984cb83aee27b7616bb2aee226d
Parents: 95f5aff
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Feb 10 12:58:07 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Feb 10 12:58:07 2016 -0500
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d36e317a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
index 323888a..bef2486 100644
--- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
@@ -29,6 +29,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
@@ -100,7 +101,8 @@ public class ExistingMacIT extends ConfigurableMacIT {
}
// TODO clean out zookeeper? following sleep waits for ephemeral nodes to go away
- UtilWaitThread.sleep(10000);
+ long zkTimeout = AccumuloConfiguration.getTimeInMillis(getCluster().getConfig().getSiteConfig().get(Property.INSTANCE_ZK_TIMEOUT.getKey()));
+ UtilWaitThread.sleep(zkTimeout + 500);
File hadoopConfDir = createTestDir(ExistingMacIT.class.getSimpleName() + "_hadoop_conf");
FileUtils.deleteQuietly(hadoopConfDir);
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a2b15bfa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a2b15bfa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a2b15bfa
Branch: refs/heads/master
Commit: a2b15bfa9937f7a2c9106323d4216c562f6d6e02
Parents: c85e04f d36e317
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Feb 10 13:02:23 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Feb 10 13:02:23 2016 -0500
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a2b15bfa/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
[3/6] accumulo git commit: ACCUMULO-4139 Fix ExistingMacIT test bug
Posted by ct...@apache.org.
ACCUMULO-4139 Fix ExistingMacIT test bug
Make ExistingMacIT wait the full ZK timeout (plus half a second) based on mini's
configured ZK timeout value.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d36e317a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d36e317a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d36e317a
Branch: refs/heads/master
Commit: d36e317a83765984cb83aee27b7616bb2aee226d
Parents: 95f5aff
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Feb 10 12:58:07 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Feb 10 12:58:07 2016 -0500
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d36e317a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
index 323888a..bef2486 100644
--- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
@@ -29,6 +29,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
@@ -100,7 +101,8 @@ public class ExistingMacIT extends ConfigurableMacIT {
}
// TODO clean out zookeeper? following sleep waits for ephemeral nodes to go away
- UtilWaitThread.sleep(10000);
+ long zkTimeout = AccumuloConfiguration.getTimeInMillis(getCluster().getConfig().getSiteConfig().get(Property.INSTANCE_ZK_TIMEOUT.getKey()));
+ UtilWaitThread.sleep(zkTimeout + 500);
File hadoopConfDir = createTestDir(ExistingMacIT.class.getSimpleName() + "_hadoop_conf");
FileUtils.deleteQuietly(hadoopConfDir);