You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/03/11 05:32:03 UTC
[1/6] git commit: ACCUMULO-2438 Timeout is a little too tight on a
busy system.
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 4cc25caa0 -> 6c050913c
refs/heads/1.6.0-SNAPSHOT da7f937b1 -> fb17d4588
refs/heads/master 389003fde -> 29e2519e0
ACCUMULO-2438 Timeout is a little too tight on a busy system.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c050913
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c050913
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c050913
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 6c050913cdf8c0fa0743f6a4408f4808026f11c8
Parents: 4cc25ca
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 11 00:25:34 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 11 00:25:34 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c050913/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java b/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
index a627dc1..9e5921d 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
@@ -60,7 +60,7 @@ public class DeleteRowsTest {
folder.delete();
}
- @Test(timeout = 120 * 1000)
+ @Test(timeout = 5 * 60 * 1000)
public void test() throws Exception {
ZooKeeperInstance zk = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
Connector c = zk.getConnector("root", new PasswordToken(secret));
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb17d458
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb17d458
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb17d458
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: fb17d4588d597e1124a47a4dd29dfc728bd1dc49
Parents: da7f937 6c05091
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 11 00:26:39 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 11 00:26:39 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb17d458/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
index 190f693,0000000..c116e30
mode 100644,000000..100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
@@@ -1,42 -1,0 +1,42 @@@
+/*
+ * 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.assertEquals;
+
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.test.functional.FunctionalTestUtils;
+import org.apache.accumulo.test.functional.SimpleMacIT;
+import org.junit.Test;
+
+public class DeleteRowsIT extends SimpleMacIT {
+
- @Test(timeout = 60 * 1000)
++ @Test(timeout = 5 * 60 * 1000)
+ public void test() throws Exception {
+ Connector c = getConnector();
+ String[] tableNames = this.getTableNames(20);
+ for (String tableName : tableNames) {
+ c.tableOperations().create(tableName);
+ c.tableOperations().deleteRows(tableName, null, null);
+ Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
+ assertEquals(0, FunctionalTestUtils.count(scanner));
+ }
+ }
+
+}
[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/29e2519e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29e2519e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29e2519e
Branch: refs/heads/master
Commit: 29e2519e0733844c8564bd3a15ba8c3df4deb9f3
Parents: 389003f fb17d45
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 11 00:26:47 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 11 00:26:47 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/6] git commit: ACCUMULO-2438 Timeout is a little too tight on a
busy system.
Posted by el...@apache.org.
ACCUMULO-2438 Timeout is a little too tight on a busy system.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c050913
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c050913
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c050913
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6c050913cdf8c0fa0743f6a4408f4808026f11c8
Parents: 4cc25ca
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 11 00:25:34 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 11 00:25:34 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c050913/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java b/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
index a627dc1..9e5921d 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
@@ -60,7 +60,7 @@ public class DeleteRowsTest {
folder.delete();
}
- @Test(timeout = 120 * 1000)
+ @Test(timeout = 5 * 60 * 1000)
public void test() throws Exception {
ZooKeeperInstance zk = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
Connector c = zk.getConnector("root", new PasswordToken(secret));
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb17d458
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb17d458
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb17d458
Branch: refs/heads/master
Commit: fb17d4588d597e1124a47a4dd29dfc728bd1dc49
Parents: da7f937 6c05091
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 11 00:26:39 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 11 00:26:39 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb17d458/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
index 190f693,0000000..c116e30
mode 100644,000000..100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
@@@ -1,42 -1,0 +1,42 @@@
+/*
+ * 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.assertEquals;
+
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.test.functional.FunctionalTestUtils;
+import org.apache.accumulo.test.functional.SimpleMacIT;
+import org.junit.Test;
+
+public class DeleteRowsIT extends SimpleMacIT {
+
- @Test(timeout = 60 * 1000)
++ @Test(timeout = 5 * 60 * 1000)
+ public void test() throws Exception {
+ Connector c = getConnector();
+ String[] tableNames = this.getTableNames(20);
+ for (String tableName : tableNames) {
+ c.tableOperations().create(tableName);
+ c.tableOperations().deleteRows(tableName, null, null);
+ Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
+ assertEquals(0, FunctionalTestUtils.count(scanner));
+ }
+ }
+
+}
[3/6] git commit: ACCUMULO-2438 Timeout is a little too tight on a
busy system.
Posted by el...@apache.org.
ACCUMULO-2438 Timeout is a little too tight on a busy system.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c050913
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c050913
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c050913
Branch: refs/heads/master
Commit: 6c050913cdf8c0fa0743f6a4408f4808026f11c8
Parents: 4cc25ca
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 11 00:25:34 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 11 00:25:34 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c050913/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java b/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
index a627dc1..9e5921d 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
@@ -60,7 +60,7 @@ public class DeleteRowsTest {
folder.delete();
}
- @Test(timeout = 120 * 1000)
+ @Test(timeout = 5 * 60 * 1000)
public void test() throws Exception {
ZooKeeperInstance zk = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
Connector c = zk.getConnector("root", new PasswordToken(secret));