[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
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/1a687381
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1a687381
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1a687381
Branch: refs/heads/master
Commit: 1a6873815a04deb12af5c8921d93c4890f653cdd
Parents: 56667cd e68d748
Author: Mike Drob md...@cloudera.com
Authored: Fri Mar 14 10:37:27 2014 -0400
Committer: Mike Drob md...@cloudera.com
Committed: Fri Mar 14 10:37:27 2014 -0400
--
.../accumulo/core/data/ArrayByteSequence.java | 7 +-
.../apache/accumulo/core/data/KeyExtent.java| 3 +-
.../core/data/ArrayByteSequenceTest.java| 107 +
.../accumulo/core/data/ByteSequenceTest.java| 41
.../apache/accumulo/core/data/ColumnTest.java | 70 --
.../accumulo/core/data/KeyExtentTest.java | 240 ++-
.../org/apache/accumulo/core/data/KeyTest.java | 33 +++
7 files changed, 416 insertions(+), 85 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1a687381/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
--
diff --cc
core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index b29a667,ca769cb..9092c5b
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@@ -78,22 -51,14 +78,23 @@@ public class ArrayByteSequence extends
this(s.getBytes(Constants.UTF8));
}
+ /**
+ * Creates a new sequence based on a byte buffer. If the byte buffer has an
+ * array, that array (and the buffer's offset and limit) are used;
otherwise,
+ * a new backing array is created and a relative bulk get is performed to
+ * transfer the buffer's contents (starting at its current position and
+ * not beyond its limit).
+ *
+ * @param buffer byte buffer
+ */
public ArrayByteSequence(ByteBuffer buffer) {
+ this.length = buffer.remaining();
+
if (buffer.hasArray()) {
this.data = buffer.array();
- this.offset = buffer.arrayOffset();
- this.length = buffer.limit();
+ this.offset = buffer.position();
} else {
- this.data = new byte[buffer.remaining()];
+ this.data = new byte[length];
this.offset = 0;
buffer.get(data);
}
[1/3] git commit: ACCUMULO-2468 Add unit tests for o.a.a.core.data
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT a3172ac7d - e68d748b0
refs/heads/master 56667cd63 - 1a6873815
ACCUMULO-2468 Add unit tests for o.a.a.core.data
Add unit tests for several classes. Convert from JUnit 3 to 4 where
appropriate. Fix bugs where new unit tests uncovered them. Replaced
assertTrue with assertEquals where possible.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e68d748b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e68d748b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e68d748b
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e68d748b02c9d11f57767addb0daec905e10cd31
Parents: a3172ac
Author: Mike Drob md...@cloudera.com
Authored: Wed Mar 12 14:50:14 2014 -0400
Committer: Mike Drob md...@cloudera.com
Committed: Fri Mar 14 10:23:38 2014 -0400
--
.../accumulo/core/data/ArrayByteSequence.java | 7 +-
.../apache/accumulo/core/data/KeyExtent.java| 3 +-
.../core/data/ArrayByteSequenceTest.java| 107 +
.../accumulo/core/data/ByteSequenceTest.java| 41
.../apache/accumulo/core/data/ColumnTest.java | 70 --
.../accumulo/core/data/KeyExtentTest.java | 240 ++-
.../org/apache/accumulo/core/data/KeyTest.java | 33 +++
7 files changed, 416 insertions(+), 85 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68d748b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index ff56c31..ca769cb 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@ -52,12 +52,13 @@ public class ArrayByteSequence extends ByteSequence
implements Serializable {
}
public ArrayByteSequence(ByteBuffer buffer) {
+this.length = buffer.remaining();
+
if (buffer.hasArray()) {
this.data = buffer.array();
- this.offset = buffer.arrayOffset();
- this.length = buffer.limit();
+ this.offset = buffer.position();
} else {
- this.data = new byte[buffer.remaining()];
+ this.data = new byte[length];
this.offset = 0;
buffer.get(data);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68d748b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
index dda78fb..4c9978f 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
@@ -301,9 +301,10 @@ public class KeyExtent implements
WritableComparableKeyExtent {
/**
* Empty start or end rows tell the method there are no start or end rows,
and to use all the keyextents that are before the end row if no start row etc.
*
+ * @deprecated this method not intended for public use and is likely to be
removed in a future version.
* @return all the key extents that the rows cover
*/
-
+ @Deprecated
public static CollectionKeyExtent getKeyExtentsForRange(Text startRow,
Text endRow, SetKeyExtent kes) {
if (kes == null)
return Collections.emptyList();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68d748b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
new file mode 100644
index 000..70c40ed
--- /dev/null
+++
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.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
[2/3] git commit: ACCUMULO-2468 Add unit tests for o.a.a.core.data
ACCUMULO-2468 Add unit tests for o.a.a.core.data
Add unit tests for several classes. Convert from JUnit 3 to 4 where
appropriate. Fix bugs where new unit tests uncovered them. Replaced
assertTrue with assertEquals where possible.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e68d748b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e68d748b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e68d748b
Branch: refs/heads/master
Commit: e68d748b02c9d11f57767addb0daec905e10cd31
Parents: a3172ac
Author: Mike Drob md...@cloudera.com
Authored: Wed Mar 12 14:50:14 2014 -0400
Committer: Mike Drob md...@cloudera.com
Committed: Fri Mar 14 10:23:38 2014 -0400
--
.../accumulo/core/data/ArrayByteSequence.java | 7 +-
.../apache/accumulo/core/data/KeyExtent.java| 3 +-
.../core/data/ArrayByteSequenceTest.java| 107 +
.../accumulo/core/data/ByteSequenceTest.java| 41
.../apache/accumulo/core/data/ColumnTest.java | 70 --
.../accumulo/core/data/KeyExtentTest.java | 240 ++-
.../org/apache/accumulo/core/data/KeyTest.java | 33 +++
7 files changed, 416 insertions(+), 85 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68d748b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index ff56c31..ca769cb 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@ -52,12 +52,13 @@ public class ArrayByteSequence extends ByteSequence
implements Serializable {
}
public ArrayByteSequence(ByteBuffer buffer) {
+this.length = buffer.remaining();
+
if (buffer.hasArray()) {
this.data = buffer.array();
- this.offset = buffer.arrayOffset();
- this.length = buffer.limit();
+ this.offset = buffer.position();
} else {
- this.data = new byte[buffer.remaining()];
+ this.data = new byte[length];
this.offset = 0;
buffer.get(data);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68d748b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
index dda78fb..4c9978f 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
@@ -301,9 +301,10 @@ public class KeyExtent implements
WritableComparableKeyExtent {
/**
* Empty start or end rows tell the method there are no start or end rows,
and to use all the keyextents that are before the end row if no start row etc.
*
+ * @deprecated this method not intended for public use and is likely to be
removed in a future version.
* @return all the key extents that the rows cover
*/
-
+ @Deprecated
public static CollectionKeyExtent getKeyExtentsForRange(Text startRow,
Text endRow, SetKeyExtent kes) {
if (kes == null)
return Collections.emptyList();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68d748b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
new file mode 100644
index 000..70c40ed
--- /dev/null
+++
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.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.core.data;
svn commit: r901581 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.5.1.html
Author: buildbot Date: Fri Mar 14 16:52:51 2014 New Revision: 901581 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/release_notes/1.5.1.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Mar 14 16:52:51 2014 @@ -1 +1 @@ -1577610 +1577611 Modified: websites/staging/accumulo/trunk/content/release_notes/1.5.1.html == --- websites/staging/accumulo/trunk/content/release_notes/1.5.1.html (original) +++ websites/staging/accumulo/trunk/content/release_notes/1.5.1.html Fri Mar 14 16:52:51 2014 @@ -213,7 +213,7 @@ column mean that all required release te pEach unit and functional test only runs on a single node, while the RandomWalk and Continuous Ingest tests run on a number of nodes. emAgitation/em refers to randomly killing Accumulo processes, Hadoop Datanode processes, and, in HDFS High-Availability instances, forcing NameNode failover. -table +table id=release_notes_testing tr thOS/th thHadoop/th
svn commit: r1577611 - /accumulo/site/trunk/content/release_notes/1.5.1.mdtext
Author: elserj Date: Fri Mar 14 16:52:45 2014 New Revision: 1577611 URL: http://svn.apache.org/r1577611 Log: ACCUMULO-2473 Make a hook for adding some styling Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.5.1.mdtext?rev=1577611r1=1577610r2=1577611view=diff == --- accumulo/site/trunk/content/release_notes/1.5.1.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.5.1.mdtext Fri Mar 14 16:52:45 2014 @@ -172,7 +172,7 @@ column mean that all required release te Each unit and functional test only runs on a single node, while the RandomWalk and Continuous Ingest tests run on a number of nodes. *Agitation* refers to randomly killing Accumulo processes, Hadoop Datanode processes, and, in HDFS High-Availability instances, forcing NameNode failover. -table +table id=release_notes_testing tr thOS/th thHadoop/th
[1/2] git commit: ACCUMULO-2475 recovery failed due to using the wrong filesystem
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT e68d748b0 - 7c2a5526a
ACCUMULO-2475 recovery failed due to using the wrong filesystem
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae750622
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae750622
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae750622
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ae750622c2baf4761afd9354540383f3b01ab6e2
Parents: 6dd1bd3
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Mar 14 12:55:32 2014 -0400
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Mar 14 12:55:32 2014 -0400
--
.../org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae750622/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
index 86c5004..7cb1fe5 100644
---
a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++
b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -46,6 +46,7 @@ import
org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.test.functional.ConfigurableMacIT;
import org.apache.accumulo.test.functional.FunctionalTestUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.RawLocalFileSystem;
import org.apache.hadoop.io.Text;
import org.junit.Test;
@@ -56,6 +57,8 @@ public class MasterRepairsDualAssignmentIT extends
ConfigurableMacIT {
public void configure(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, 5s);
cfg.setProperty(Property.MASTER_RECOVERY_DELAY, 5s);
+// use raw local file system so walogs sync and flush will work
+hadoopCoreSite.set(fs.file.impl, RawLocalFileSystem.class.getName());
}
@Test(timeout = 5 * 60 * 1000)
[2/2] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/7c2a5526 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c2a5526 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c2a5526 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 7c2a5526a1ce9b729e8a14ce9a34b457959bfa5e Parents: ae75062 e68d748 Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 12:55:59 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 12:55:59 2014 -0400 -- README | 5 +- .../accumulo/core/data/ArrayByteSequence.java | 7 +- .../apache/accumulo/core/data/KeyExtent.java| 3 +- .../core/security/NamespacePermission.java | 1 + .../core/data/ArrayByteSequenceTest.java| 107 + .../accumulo/core/data/ByteSequenceTest.java| 41 .../apache/accumulo/core/data/ColumnTest.java | 70 -- .../accumulo/core/data/KeyExtentTest.java | 240 ++- .../org/apache/accumulo/core/data/KeyTest.java | 33 +++ .../iterators/user/BigDecimalCombinerTest.java | 91 +-- .../core/iterators/user/CombinerTest.java | 2 +- .../core/security/ColumnVisibilityTest.java | 34 ++- .../core/security/NamespacePermissionsTest.java | 39 +++ .../core/security/VisibilityConstraintTest.java | 106 pom.xml | 7 + .../tserver/TabletServerResourceManager.java| 19 +- .../randomwalk/security/SecurityFixture.java| 2 + 17 files changed, 694 insertions(+), 113 deletions(-) --
[2/5] git commit: Merge branch '1.6.0-SNAPSHOT'
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/2610f66e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2610f66e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2610f66e Branch: refs/heads/master Commit: 2610f66e500ee0f4cd523842503ec66bf7e1cee3 Parents: 20375b6 ae75062 Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 12:55:47 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 12:55:47 2014 -0400 -- .../org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java | 3 +++ 1 file changed, 3 insertions(+) --
[5/5] git commit: Merge branch '1.6.0-SNAPSHOT'
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/ea076646 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ea076646 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ea076646 Branch: refs/heads/master Commit: ea076646bf03c18bc3ee61325be85dce307c61d7 Parents: 7f009d8 7c2a552 Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 12:56:31 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 12:56:31 2014 -0400 -- --
[4/5] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7f009d84 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7f009d84 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7f009d84 Branch: refs/heads/master Commit: 7f009d845725b19ad52ba2fadf8f93300fc0d3e8 Parents: 2610f66 1a68738 Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 12:56:23 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 12:56:23 2014 -0400 -- README | 5 +- .../accumulo/core/data/ArrayByteSequence.java | 7 +- .../apache/accumulo/core/data/KeyExtent.java| 3 +- .../core/security/NamespacePermission.java | 1 + .../core/data/ArrayByteSequenceTest.java| 107 + .../accumulo/core/data/ByteSequenceTest.java| 41 .../apache/accumulo/core/data/ColumnTest.java | 70 -- .../accumulo/core/data/KeyExtentTest.java | 240 ++- .../org/apache/accumulo/core/data/KeyTest.java | 33 +++ .../iterators/user/BigDecimalCombinerTest.java | 91 +-- .../core/iterators/user/CombinerTest.java | 2 +- .../core/security/ColumnVisibilityTest.java | 34 ++- .../core/security/NamespacePermissionsTest.java | 39 +++ .../core/security/VisibilityConstraintTest.java | 106 pom.xml | 7 + .../tserver/TabletServerResourceManager.java| 19 +- .../randomwalk/security/SecurityFixture.java| 2 + 17 files changed, 694 insertions(+), 113 deletions(-) --
[1/5] git commit: ACCUMULO-2475 recovery failed due to using the wrong filesystem
Repository: accumulo
Updated Branches:
refs/heads/master 1a6873815 - ea076646b
ACCUMULO-2475 recovery failed due to using the wrong filesystem
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae750622
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae750622
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae750622
Branch: refs/heads/master
Commit: ae750622c2baf4761afd9354540383f3b01ab6e2
Parents: 6dd1bd3
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Mar 14 12:55:32 2014 -0400
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Mar 14 12:55:32 2014 -0400
--
.../org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae750622/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
index 86c5004..7cb1fe5 100644
---
a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++
b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -46,6 +46,7 @@ import
org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.test.functional.ConfigurableMacIT;
import org.apache.accumulo.test.functional.FunctionalTestUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.RawLocalFileSystem;
import org.apache.hadoop.io.Text;
import org.junit.Test;
@@ -56,6 +57,8 @@ public class MasterRepairsDualAssignmentIT extends
ConfigurableMacIT {
public void configure(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, 5s);
cfg.setProperty(Property.MASTER_RECOVERY_DELAY, 5s);
+// use raw local file system so walogs sync and flush will work
+hadoopCoreSite.set(fs.file.impl, RawLocalFileSystem.class.getName());
}
@Test(timeout = 5 * 60 * 1000)
svn commit: r901580 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.5.1.html
Author: buildbot Date: Fri Mar 14 16:50:26 2014 New Revision: 901580 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/release_notes/1.5.1.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Mar 14 16:50:26 2014 @@ -1 +1 @@ -1577379 +1577610 Modified: websites/staging/accumulo/trunk/content/release_notes/1.5.1.html == --- websites/staging/accumulo/trunk/content/release_notes/1.5.1.html (original) +++ websites/staging/accumulo/trunk/content/release_notes/1.5.1.html Fri Mar 14 16:50:26 2014 @@ -200,6 +200,61 @@ mutation queues./p lia href=https://issues.apache.org/jira/browse/ACCUMULO-2226;ACCUMULO-2226/a/li lia href=https://issues.apache.org/jira/browse/ACCUMULO-1470;ACCUMULO-1470/a/li /ul +h2 id=testingTesting/h2 +pBelow is a list of all platforms that 1.5.1 was tested against by developers. A value of emAll/em in the Tests +column mean that all required release tests were run on this platform. That list includes the following:/p +ol +liSuccessfully run all unit tests/li +liSuccessfully run all functional test (test/system/auto)/li +liSuccessfully complete two 24-hour RandomWalk tests (LongClean module), with and without agitation/li +liSuccessfully complete two 24-hour Continuous Ingest tests, with and without agitation, with data verification/li +liSuccessfully complete two 72-hour Continuous Ingest tests, with and without agitation/li +/ol +pEach unit and functional test only runs on a single node, while the RandomWalk and Continuous Ingest tests run +on a number of nodes. emAgitation/em refers to randomly killing Accumulo processes, Hadoop Datanode processes, +and, in HDFS High-Availability instances, forcing NameNode failover. +table + tr +thOS/th +thHadoop/th +thNodes/th +thZooKeeper/th +thHDFS High-Availability/th +thTests/th + /tr + tr +tdCentOS 6.5/td +tdHDP 2.0 (Apache 2.2.0)/td +td6/td +tdHDP 2.0 (Apache 3.4.5)/td +tdYes (QJM)/td +tdAll required tests/td + /tr + tr +tdCentOS 6.4/td +tdCDH 4.5.0 (2.0.0+cdh4.5.0)/td +td7/td +tdCDH 4.5.0 (3.4.5+cdh4.5.0)/td +tdYes (QJM)/td +tdUnit, functional and 24hr Randomwalk w/ agitation/td + /tr + tr +tdCentOS 6.4/td +tdCDH 4.5.0 (2.0.0+cdh4.5.0)/td +td7/td +tdCDH 4.5.0 (3.4.5+cdh4.5.0)/td +tdYes (QJM)/td +td2x 24/hr continuous ingest w/ verification/td + /tr + tr +tdCentOS 6.3/td +tdApache 1.0.4/td +td1/td +tdApache 3.3.5/td +tdNo/td +tdSniff test, unit and functional tests/td + /tr +/table/p /div div id=footer
svn commit: r1577610 - /accumulo/site/trunk/content/release_notes/1.5.1.mdtext
Author: elserj Date: Fri Mar 14 16:50:13 2014 New Revision: 1577610 URL: http://svn.apache.org/r1577610 Log: ACCUMULO-2473 Aggregating all reported testing for 1.5.1 release Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.5.1.mdtext?rev=1577610r1=1577609r2=1577610view=diff == --- accumulo/site/trunk/content/release_notes/1.5.1.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.5.1.mdtext Fri Mar 14 16:50:13 2014 @@ -158,6 +158,62 @@ The following documentation updates were * [ACCUMULO-2226][33] * [ACCUMULO-1470][34] +## Testing + +Below is a list of all platforms that 1.5.1 was tested against by developers. A value of *All* in the Tests +column mean that all required release tests were run on this platform. That list includes the following: + + 1. Successfully run all unit tests + 2. Successfully run all functional test (test/system/auto) + 3. Successfully complete two 24-hour RandomWalk tests (LongClean module), with and without agitation + 4. Successfully complete two 24-hour Continuous Ingest tests, with and without agitation, with data verification + 5. Successfully complete two 72-hour Continuous Ingest tests, with and without agitation + +Each unit and functional test only runs on a single node, while the RandomWalk and Continuous Ingest tests run +on a number of nodes. *Agitation* refers to randomly killing Accumulo processes, Hadoop Datanode processes, +and, in HDFS High-Availability instances, forcing NameNode failover. +table + tr +thOS/th +thHadoop/th +thNodes/th +thZooKeeper/th +thHDFS High-Availability/th +thTests/th + /tr + tr +tdCentOS 6.5/td +tdHDP 2.0 (Apache 2.2.0)/td +td6/td +tdHDP 2.0 (Apache 3.4.5)/td +tdYes (QJM)/td +tdAll required tests/td + /tr + tr +tdCentOS 6.4/td +tdCDH 4.5.0 (2.0.0+cdh4.5.0)/td +td7/td +tdCDH 4.5.0 (3.4.5+cdh4.5.0)/td +tdYes (QJM)/td +tdUnit, functional and 24hr Randomwalk w/ agitation/td + /tr + tr +tdCentOS 6.4/td +tdCDH 4.5.0 (2.0.0+cdh4.5.0)/td +td7/td +tdCDH 4.5.0 (3.4.5+cdh4.5.0)/td +tdYes (QJM)/td +td2x 24/hr continuous ingest w/ verification/td + /tr + tr +tdCentOS 6.3/td +tdApache 1.0.4/td +td1/td +tdApache 3.3.5/td +tdNo/td +tdSniff test, unit and functional tests/td + /tr +/table [1]: https://issues.apache.org/jira/browse/ACCUMULO-1905?focusedCommentId=13915208page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13915208 [2]: https://issues.apache.org/jira/browse/ACCUMULO-1950
svn commit: r1577612 - /accumulo/site/trunk/content/css/accumulo.css
Author: elserj
Date: Fri Mar 14 17:00:06 2014
New Revision: 1577612
URL: http://svn.apache.org/r1577612
Log:
ACCUMULO-2473 Styling for the 1.5.1 release notes table
Modified:
accumulo/site/trunk/content/css/accumulo.css
Modified: accumulo/site/trunk/content/css/accumulo.css
URL:
http://svn.apache.org/viewvc/accumulo/site/trunk/content/css/accumulo.css?rev=1577612r1=1577611r2=1577612view=diff
==
--- accumulo/site/trunk/content/css/accumulo.css (original)
+++ accumulo/site/trunk/content/css/accumulo.css Fri Mar 14 17:00:06 2014
@@ -159,3 +159,15 @@ dt {
display: inline;
float: left;
}
+
+#release_notes_testing {
+border-collapse:collapse;
+}
+
+#release_notes_testing, #release_notes_testing tbody tr,
#release_notes_testing tbody tr th, #release_notes_testing tbody tr td {
+border: 2px solid black;
+}
+
+#release_notes_testing tbody tr th, #release_notes_testing tbody tr td {
+padding: 5px;
+}
\ No newline at end of file
svn commit: r901582 - in /websites/staging/accumulo/trunk/content: ./ css/accumulo.css
Author: buildbot
Date: Fri Mar 14 17:00:12 2014
New Revision: 901582
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/css/accumulo.css
Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 14 17:00:12 2014
@@ -1 +1 @@
-1577611
+1577612
Modified: websites/staging/accumulo/trunk/content/css/accumulo.css
==
--- websites/staging/accumulo/trunk/content/css/accumulo.css (original)
+++ websites/staging/accumulo/trunk/content/css/accumulo.css Fri Mar 14
17:00:12 2014
@@ -159,3 +159,15 @@ dt {
display: inline;
float: left;
}
+
+#release_notes_testing {
+border-collapse:collapse;
+}
+
+#release_notes_testing, #release_notes_testing tbody tr,
#release_notes_testing tbody tr th, #release_notes_testing tbody tr td {
+border: 2px solid black;
+}
+
+#release_notes_testing tbody tr th, #release_notes_testing tbody tr td {
+padding: 5px;
+}
\ No newline at end of file
svn commit: r1577625 - /accumulo/site/trunk/content/release_notes/1.5.1.mdtext
Author: elserj Date: Fri Mar 14 17:59:31 2014 New Revision: 1577625 URL: http://svn.apache.org/r1577625 Log: ACCUMULO-2473 Slightly clearer description of testing Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.5.1.mdtext?rev=1577625r1=1577624r2=1577625view=diff == --- accumulo/site/trunk/content/release_notes/1.5.1.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.5.1.mdtext Fri Mar 14 17:59:31 2014 @@ -211,7 +211,7 @@ and, in HDFS High-Availability instances td1/td tdApache 3.3.5/td tdNo/td -tdSniff test, unit and functional tests/td +tdLocal testing, unit and functional tests/td /tr /table
svn commit: r1577644 - /accumulo/site/trunk/content/release_notes/1.5.1.mdtext
Author: elserj Date: Fri Mar 14 18:10:59 2014 New Revision: 1577644 URL: http://svn.apache.org/r1577644 Log: ACCUMULO-2473 Adding one last test platform Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.5.1.mdtext?rev=1577644r1=1577643r2=1577644view=diff == --- accumulo/site/trunk/content/release_notes/1.5.1.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.5.1.mdtext Fri Mar 14 18:10:59 2014 @@ -213,6 +213,14 @@ and, in HDFS High-Availability instances tdNo/td tdLocal testing, unit and functional tests/td /tr + tr +tdRHEL 6.4/td +tdApache 2.2.0/td +td10/td +tdApache 3.4.5/td +tdNo/td +tdFunctional tests/td + /tr /table [1]: https://issues.apache.org/jira/browse/ACCUMULO-1905?focusedCommentId=13915208page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13915208
svn commit: r901594 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.5.1.html
Author: buildbot Date: Fri Mar 14 18:11:04 2014 New Revision: 901594 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/release_notes/1.5.1.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Mar 14 18:11:04 2014 @@ -1 +1 @@ -1577625 +1577644 Modified: websites/staging/accumulo/trunk/content/release_notes/1.5.1.html == --- websites/staging/accumulo/trunk/content/release_notes/1.5.1.html (original) +++ websites/staging/accumulo/trunk/content/release_notes/1.5.1.html Fri Mar 14 18:11:04 2014 @@ -254,6 +254,14 @@ and, in HDFS High-Availability instances tdNo/td tdLocal testing, unit and functional tests/td /tr + tr +tdRHEL 6.4/td +tdApache 2.2.0/td +td10/td +tdApache 3.4.5/td +tdNo/td +tdFunctional tests/td + /tr /table/p /div
svn commit: r1577646 - /accumulo/site/trunk/content/release_notes/1.5.1.mdtext
Author: elserj Date: Fri Mar 14 18:14:03 2014 New Revision: 1577646 URL: http://svn.apache.org/r1577646 Log: ACCUMULO-2473 Better verbage Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext Modified: accumulo/site/trunk/content/release_notes/1.5.1.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.5.1.mdtext?rev=1577646r1=1577645r2=1577646view=diff == --- accumulo/site/trunk/content/release_notes/1.5.1.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.5.1.mdtext Fri Mar 14 18:14:03 2014 @@ -160,8 +160,8 @@ The following documentation updates were ## Testing -Below is a list of all platforms that 1.5.1 was tested against by developers. A value of *All* in the Tests -column mean that all required release tests were run on this platform. That list includes the following: +Below is a list of all platforms that 1.5.1 was tested against by developers. Each Apache Accumulo release +has a set of tests that must be run before the candidate is capable of becoming an official release. That list includes the following: 1. Successfully run all unit tests 2. Successfully run all functional test (test/system/auto) @@ -170,7 +170,7 @@ column mean that all required release te 5. Successfully complete two 72-hour Continuous Ingest tests, with and without agitation Each unit and functional test only runs on a single node, while the RandomWalk and Continuous Ingest tests run -on a number of nodes. *Agitation* refers to randomly killing Accumulo processes, Hadoop Datanode processes, +on any number of nodes. *Agitation* refers to randomly restarting Accumulo processes and Hadoop Datanode processes, and, in HDFS High-Availability instances, forcing NameNode failover. table id=release_notes_testing tr
svn commit: r901595 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.5.1.html
Author: buildbot Date: Fri Mar 14 18:14:09 2014 New Revision: 901595 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/release_notes/1.5.1.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Mar 14 18:14:09 2014 @@ -1 +1 @@ -1577644 +1577646 Modified: websites/staging/accumulo/trunk/content/release_notes/1.5.1.html == --- websites/staging/accumulo/trunk/content/release_notes/1.5.1.html (original) +++ websites/staging/accumulo/trunk/content/release_notes/1.5.1.html Fri Mar 14 18:14:09 2014 @@ -201,8 +201,8 @@ mutation queues./p lia href=https://issues.apache.org/jira/browse/ACCUMULO-1470;ACCUMULO-1470/a/li /ul h2 id=testingTesting/h2 -pBelow is a list of all platforms that 1.5.1 was tested against by developers. A value of emAll/em in the Tests -column mean that all required release tests were run on this platform. That list includes the following:/p +pBelow is a list of all platforms that 1.5.1 was tested against by developers. Each Apache Accumulo release +has a set of tests that must be run before the candidate is capable of becoming an official release. That list includes the following:/p ol liSuccessfully run all unit tests/li liSuccessfully run all functional test (test/system/auto)/li @@ -211,7 +211,7 @@ column mean that all required release te liSuccessfully complete two 72-hour Continuous Ingest tests, with and without agitation/li /ol pEach unit and functional test only runs on a single node, while the RandomWalk and Continuous Ingest tests run -on a number of nodes. emAgitation/em refers to randomly killing Accumulo processes, Hadoop Datanode processes, +on any number of nodes. emAgitation/em refers to randomly restarting Accumulo processes and Hadoop Datanode processes, and, in HDFS High-Availability instances, forcing NameNode failover. table id=release_notes_testing tr
[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f98331c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f98331c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f98331c Branch: refs/heads/1.6.0-SNAPSHOT Commit: 8f98331c5ea3e3a3c0068b03bfdd37fb08dc4631 Parents: 7c2a552 082adbf Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 14:18:56 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 14:18:56 2014 -0400 -- --
[1/3] git commit: ACCUMULO-2476, ACCUMULO-2342 Sleep after we modify a constraint. -- cherry-picked d4b06999 back to 1.4
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 7c2a5526a - 8f98331c5
ACCUMULO-2476, ACCUMULO-2342 Sleep after we modify a constraint. --
cherry-picked d4b06999 back to 1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6df83da6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6df83da6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6df83da6
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6df83da60d594f66d147a479065ff51db73fb1a2
Parents: ea86b44
Author: Josh Elser els...@apache.org
Authored: Sat Feb 8 16:10:53 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Mar 14 14:17:48 2014 -0400
--
.../src/test/java/org/apache/accumulo/proxy/SimpleTest.java | 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df83da6/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
--
diff --git a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
index 67b36a6..faaf3b7 100644
--- a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
+++ b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
@@ -613,6 +613,8 @@ public class SimpleTest {
} catch (MutationsRejectedException e) {}
client.removeConstraint(creds, TABLE_TEST, 1);
+
+UtilWaitThread.sleep(2000);
writerOptions = new WriterOptions();
writerOptions.setLatencyMs(1);
@@ -641,6 +643,9 @@ public class SimpleTest {
client.createTable(creds, TABLE_TEST, true, TimeType.MILLIS);
// constraints
client.addConstraint(creds, TABLE_TEST,
NumericValueConstraint.class.getName());
+
+UtilWaitThread.sleep(2000);
+
client.updateAndFlush(creds, TABLE_TEST, mutation(row1, cf, cq,
123));
try {
@@ -649,6 +654,10 @@ public class SimpleTest {
} catch (MutationsRejectedException ex) {}
client.removeConstraint(creds, TABLE_TEST, 1);
+
+UtilWaitThread.sleep(2000);
+
+assertEquals(0, client.listConstraints(creds, TABLE_TEST).size());
client.updateAndFlush(creds, TABLE_TEST, mutation(row1, cf, cq,
x));
String scanner = client.createScanner(creds, TABLE_TEST, null);
ScanResult more = client.nextK(scanner, 2);
[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/082adbfd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/082adbfd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/082adbfd Branch: refs/heads/1.5.2-SNAPSHOT Commit: 082adbfd2c1f3bf7c64304485676142e67bec3c1 Parents: a99b0b6 6df83da Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 14:18:07 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 14:18:07 2014 -0400 -- proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/082adbfd/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java -- diff --cc proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java index 77e7b9e,000..6e5398c mode 100644,00..100644 --- a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java +++ b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java @@@ -1,1222 -1,0 +1,1222 @@@ +/* + * 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.proxy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Random; +import java.util.Set; +import java.util.TreeMap; +import java.util.UUID; + +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.conf.DefaultConfiguration; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.file.FileOperations; +import org.apache.accumulo.core.file.FileSKVWriter; +import org.apache.accumulo.core.iterators.DevNull; +import org.apache.accumulo.core.iterators.SortedKeyValueIterator; +import org.apache.accumulo.core.iterators.user.SummingCombiner; +import org.apache.accumulo.core.iterators.user.VersioningIterator; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint; +import org.apache.accumulo.minicluster.MiniAccumuloCluster; +import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client; +import org.apache.accumulo.proxy.thrift.AccumuloSecurityException; +import org.apache.accumulo.proxy.thrift.ActiveCompaction; +import org.apache.accumulo.proxy.thrift.ActiveScan; +import org.apache.accumulo.proxy.thrift.BatchScanOptions; +import org.apache.accumulo.proxy.thrift.ColumnUpdate; +import org.apache.accumulo.proxy.thrift.CompactionReason; +import org.apache.accumulo.proxy.thrift.CompactionType; +import org.apache.accumulo.proxy.thrift.IteratorScope; +import org.apache.accumulo.proxy.thrift.IteratorSetting; +import org.apache.accumulo.proxy.thrift.Key; +import org.apache.accumulo.proxy.thrift.MutationsRejectedException; +import org.apache.accumulo.proxy.thrift.PartialKey; +import org.apache.accumulo.proxy.thrift.Range; +import org.apache.accumulo.proxy.thrift.ScanColumn; +import org.apache.accumulo.proxy.thrift.ScanOptions; +import org.apache.accumulo.proxy.thrift.ScanResult; +import org.apache.accumulo.proxy.thrift.ScanState; +import org.apache.accumulo.proxy.thrift.ScanType; +import org.apache.accumulo.proxy.thrift.SystemPermission; +import
[3/4] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f98331c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f98331c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f98331c Branch: refs/heads/master Commit: 8f98331c5ea3e3a3c0068b03bfdd37fb08dc4631 Parents: 7c2a552 082adbf Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 14:18:56 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 14:18:56 2014 -0400 -- --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
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/fe5fc305 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fe5fc305 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fe5fc305 Branch: refs/heads/master Commit: fe5fc3056785b560a3b677824b56d7f2c408a8f9 Parents: ea07664 8f98331 Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 14:19:06 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 14:19:06 2014 -0400 -- --
[1/2] git commit: ACCUMULO-2476, ACCUMULO-2342 Sleep after we modify a constraint. -- cherry-picked d4b06999 back to 1.4
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT a99b0b674 - 082adbfd2
ACCUMULO-2476, ACCUMULO-2342 Sleep after we modify a constraint. --
cherry-picked d4b06999 back to 1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6df83da6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6df83da6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6df83da6
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 6df83da60d594f66d147a479065ff51db73fb1a2
Parents: ea86b44
Author: Josh Elser els...@apache.org
Authored: Sat Feb 8 16:10:53 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Mar 14 14:17:48 2014 -0400
--
.../src/test/java/org/apache/accumulo/proxy/SimpleTest.java | 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df83da6/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
--
diff --git a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
index 67b36a6..faaf3b7 100644
--- a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
+++ b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
@@ -613,6 +613,8 @@ public class SimpleTest {
} catch (MutationsRejectedException e) {}
client.removeConstraint(creds, TABLE_TEST, 1);
+
+UtilWaitThread.sleep(2000);
writerOptions = new WriterOptions();
writerOptions.setLatencyMs(1);
@@ -641,6 +643,9 @@ public class SimpleTest {
client.createTable(creds, TABLE_TEST, true, TimeType.MILLIS);
// constraints
client.addConstraint(creds, TABLE_TEST,
NumericValueConstraint.class.getName());
+
+UtilWaitThread.sleep(2000);
+
client.updateAndFlush(creds, TABLE_TEST, mutation(row1, cf, cq,
123));
try {
@@ -649,6 +654,10 @@ public class SimpleTest {
} catch (MutationsRejectedException ex) {}
client.removeConstraint(creds, TABLE_TEST, 1);
+
+UtilWaitThread.sleep(2000);
+
+assertEquals(0, client.listConstraints(creds, TABLE_TEST).size());
client.updateAndFlush(creds, TABLE_TEST, mutation(row1, cf, cq,
x));
String scanner = client.createScanner(creds, TABLE_TEST, null);
ScanResult more = client.nextK(scanner, 2);
[1/4] git commit: ACCUMULO-2476, ACCUMULO-2342 Sleep after we modify a constraint. -- cherry-picked d4b06999 back to 1.4
Repository: accumulo
Updated Branches:
refs/heads/master ea076646b - fe5fc3056
ACCUMULO-2476, ACCUMULO-2342 Sleep after we modify a constraint. --
cherry-picked d4b06999 back to 1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6df83da6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6df83da6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6df83da6
Branch: refs/heads/master
Commit: 6df83da60d594f66d147a479065ff51db73fb1a2
Parents: ea86b44
Author: Josh Elser els...@apache.org
Authored: Sat Feb 8 16:10:53 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Mar 14 14:17:48 2014 -0400
--
.../src/test/java/org/apache/accumulo/proxy/SimpleTest.java | 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df83da6/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
--
diff --git a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
index 67b36a6..faaf3b7 100644
--- a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
+++ b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
@@ -613,6 +613,8 @@ public class SimpleTest {
} catch (MutationsRejectedException e) {}
client.removeConstraint(creds, TABLE_TEST, 1);
+
+UtilWaitThread.sleep(2000);
writerOptions = new WriterOptions();
writerOptions.setLatencyMs(1);
@@ -641,6 +643,9 @@ public class SimpleTest {
client.createTable(creds, TABLE_TEST, true, TimeType.MILLIS);
// constraints
client.addConstraint(creds, TABLE_TEST,
NumericValueConstraint.class.getName());
+
+UtilWaitThread.sleep(2000);
+
client.updateAndFlush(creds, TABLE_TEST, mutation(row1, cf, cq,
123));
try {
@@ -649,6 +654,10 @@ public class SimpleTest {
} catch (MutationsRejectedException ex) {}
client.removeConstraint(creds, TABLE_TEST, 1);
+
+UtilWaitThread.sleep(2000);
+
+assertEquals(0, client.listConstraints(creds, TABLE_TEST).size());
client.updateAndFlush(creds, TABLE_TEST, mutation(row1, cf, cq,
x));
String scanner = client.createScanner(creds, TABLE_TEST, null);
ScanResult more = client.nextK(scanner, 2);
git commit: ACCUMULO-2476, ACCUMULO-2342 Sleep after we modify a constraint. -- cherry-picked d4b06999 back to 1.4
Repository: accumulo
Updated Branches:
refs/heads/1.4.5-SNAPSHOT ea86b44df - 6df83da60
ACCUMULO-2476, ACCUMULO-2342 Sleep after we modify a constraint. --
cherry-picked d4b06999 back to 1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6df83da6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6df83da6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6df83da6
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 6df83da60d594f66d147a479065ff51db73fb1a2
Parents: ea86b44
Author: Josh Elser els...@apache.org
Authored: Sat Feb 8 16:10:53 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Mar 14 14:17:48 2014 -0400
--
.../src/test/java/org/apache/accumulo/proxy/SimpleTest.java | 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df83da6/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
--
diff --git a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
index 67b36a6..faaf3b7 100644
--- a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
+++ b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
@@ -613,6 +613,8 @@ public class SimpleTest {
} catch (MutationsRejectedException e) {}
client.removeConstraint(creds, TABLE_TEST, 1);
+
+UtilWaitThread.sleep(2000);
writerOptions = new WriterOptions();
writerOptions.setLatencyMs(1);
@@ -641,6 +643,9 @@ public class SimpleTest {
client.createTable(creds, TABLE_TEST, true, TimeType.MILLIS);
// constraints
client.addConstraint(creds, TABLE_TEST,
NumericValueConstraint.class.getName());
+
+UtilWaitThread.sleep(2000);
+
client.updateAndFlush(creds, TABLE_TEST, mutation(row1, cf, cq,
123));
try {
@@ -649,6 +654,10 @@ public class SimpleTest {
} catch (MutationsRejectedException ex) {}
client.removeConstraint(creds, TABLE_TEST, 1);
+
+UtilWaitThread.sleep(2000);
+
+assertEquals(0, client.listConstraints(creds, TABLE_TEST).size());
client.updateAndFlush(creds, TABLE_TEST, mutation(row1, cf, cq,
x));
String scanner = client.createScanner(creds, TABLE_TEST, null);
ScanResult more = client.nextK(scanner, 2);
[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/082adbfd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/082adbfd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/082adbfd Branch: refs/heads/1.6.0-SNAPSHOT Commit: 082adbfd2c1f3bf7c64304485676142e67bec3c1 Parents: a99b0b6 6df83da Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 14:18:07 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 14:18:07 2014 -0400 -- proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/082adbfd/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java -- diff --cc proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java index 77e7b9e,000..6e5398c mode 100644,00..100644 --- a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java +++ b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java @@@ -1,1222 -1,0 +1,1222 @@@ +/* + * 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.proxy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Random; +import java.util.Set; +import java.util.TreeMap; +import java.util.UUID; + +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.conf.DefaultConfiguration; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.file.FileOperations; +import org.apache.accumulo.core.file.FileSKVWriter; +import org.apache.accumulo.core.iterators.DevNull; +import org.apache.accumulo.core.iterators.SortedKeyValueIterator; +import org.apache.accumulo.core.iterators.user.SummingCombiner; +import org.apache.accumulo.core.iterators.user.VersioningIterator; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint; +import org.apache.accumulo.minicluster.MiniAccumuloCluster; +import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client; +import org.apache.accumulo.proxy.thrift.AccumuloSecurityException; +import org.apache.accumulo.proxy.thrift.ActiveCompaction; +import org.apache.accumulo.proxy.thrift.ActiveScan; +import org.apache.accumulo.proxy.thrift.BatchScanOptions; +import org.apache.accumulo.proxy.thrift.ColumnUpdate; +import org.apache.accumulo.proxy.thrift.CompactionReason; +import org.apache.accumulo.proxy.thrift.CompactionType; +import org.apache.accumulo.proxy.thrift.IteratorScope; +import org.apache.accumulo.proxy.thrift.IteratorSetting; +import org.apache.accumulo.proxy.thrift.Key; +import org.apache.accumulo.proxy.thrift.MutationsRejectedException; +import org.apache.accumulo.proxy.thrift.PartialKey; +import org.apache.accumulo.proxy.thrift.Range; +import org.apache.accumulo.proxy.thrift.ScanColumn; +import org.apache.accumulo.proxy.thrift.ScanOptions; +import org.apache.accumulo.proxy.thrift.ScanResult; +import org.apache.accumulo.proxy.thrift.ScanState; +import org.apache.accumulo.proxy.thrift.ScanType; +import org.apache.accumulo.proxy.thrift.SystemPermission; +import
[2/4] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/082adbfd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/082adbfd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/082adbfd Branch: refs/heads/master Commit: 082adbfd2c1f3bf7c64304485676142e67bec3c1 Parents: a99b0b6 6df83da Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 14:18:07 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 14:18:07 2014 -0400 -- proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/082adbfd/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java -- diff --cc proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java index 77e7b9e,000..6e5398c mode 100644,00..100644 --- a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java +++ b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java @@@ -1,1222 -1,0 +1,1222 @@@ +/* + * 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.proxy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Random; +import java.util.Set; +import java.util.TreeMap; +import java.util.UUID; + +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.conf.DefaultConfiguration; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.file.FileOperations; +import org.apache.accumulo.core.file.FileSKVWriter; +import org.apache.accumulo.core.iterators.DevNull; +import org.apache.accumulo.core.iterators.SortedKeyValueIterator; +import org.apache.accumulo.core.iterators.user.SummingCombiner; +import org.apache.accumulo.core.iterators.user.VersioningIterator; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint; +import org.apache.accumulo.minicluster.MiniAccumuloCluster; +import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client; +import org.apache.accumulo.proxy.thrift.AccumuloSecurityException; +import org.apache.accumulo.proxy.thrift.ActiveCompaction; +import org.apache.accumulo.proxy.thrift.ActiveScan; +import org.apache.accumulo.proxy.thrift.BatchScanOptions; +import org.apache.accumulo.proxy.thrift.ColumnUpdate; +import org.apache.accumulo.proxy.thrift.CompactionReason; +import org.apache.accumulo.proxy.thrift.CompactionType; +import org.apache.accumulo.proxy.thrift.IteratorScope; +import org.apache.accumulo.proxy.thrift.IteratorSetting; +import org.apache.accumulo.proxy.thrift.Key; +import org.apache.accumulo.proxy.thrift.MutationsRejectedException; +import org.apache.accumulo.proxy.thrift.PartialKey; +import org.apache.accumulo.proxy.thrift.Range; +import org.apache.accumulo.proxy.thrift.ScanColumn; +import org.apache.accumulo.proxy.thrift.ScanOptions; +import org.apache.accumulo.proxy.thrift.ScanResult; +import org.apache.accumulo.proxy.thrift.ScanState; +import org.apache.accumulo.proxy.thrift.ScanType; +import org.apache.accumulo.proxy.thrift.SystemPermission; +import
svn commit: r901598 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/
Author: elserj Date: Fri Mar 14 18:33:10 2014 New Revision: 901598 Log: Publishing svnmucc operation to accumulo site by elserj Added: websites/production/accumulo/content/ - copied from r901597, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r901597, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r901597, websites/production/accumulo/content/1.5/apidocs/
[10/26] git commit: ACCUMULO-2061 Propagate errors on delete or mkdirs failure.
ACCUMULO-2061 Propagate errors on delete or mkdirs failure.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/560af51c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/560af51c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/560af51c
Branch: refs/heads/ACCUMULO-2061
Commit: 560af51cac6e38da4829706292fa7b3f0d576336
Parents: e3adf78
Author: Josh Elser els...@apache.org
Authored: Wed Mar 12 16:19:19 2014 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Mar 12 16:19:19 2014 -0400
--
.../org/apache/accumulo/server/util/ChangeSecret.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/560af51c/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
index f0dcd14..2926a3f 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
@@ -147,8 +147,14 @@ public class ChangeSecret {
// Need to recreate the instanceId on all of them to keep consistency
for (Volume v : fs.getVolumes()) {
final Path instanceId = ServerConstants.getInstanceIdLocation(v);
- v.getFileSystem().delete(instanceId, true);
- v.getFileSystem().mkdirs(instanceId);
+ if (!v.getFileSystem().delete(instanceId, true)) {
+throw new IOException(Could not recursively delete + instanceId);
+ }
+
+ if (!v.getFileSystem().mkdirs(instanceId)) {
+throw new IOException(Could not create directory + instanceId);
+ }
+
v.getFileSystem().create(new Path(instanceId, newInstanceId)).close();
}
}
[02/26] git commit: ACCUMULO-2451 Update thet data version on all volumes instead of just one
ACCUMULO-2451 Update thet data version on all volumes instead of just one
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7086a7e7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7086a7e7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7086a7e7
Branch: refs/heads/ACCUMULO-2061
Commit: 7086a7e70c0c551ce41f9f55addaf3a1a22b1d06
Parents: db76dd7
Author: Josh Elser els...@apache.org
Authored: Wed Mar 12 12:10:44 2014 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Mar 12 12:10:44 2014 -0400
--
.../org/apache/accumulo/server/Accumulo.java| 22 +---
1 file changed, 14 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7086a7e7/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 48534f0..f7f2298 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -51,15 +51,21 @@ public class Accumulo {
private static final Logger log = Logger.getLogger(Accumulo.class);
public static synchronized void updateAccumuloVersion(VolumeManager fs) {
-// TODO ACCUMULO-2451 Should update all volumes, not one
-Volume volume = fs.getVolumes().iterator().next();
-try {
- if (getAccumuloPersistentVersion(fs) ==
ServerConstants.PREV_DATA_VERSION) {
-fs.create(new Path(ServerConstants.getDataVersionLocation(volume),
Integer.toString(ServerConstants.DATA_VERSION)));
-fs.delete(new Path(ServerConstants.getDataVersionLocation(volume),
Integer.toString(ServerConstants.PREV_DATA_VERSION)));
+for (Volume volume : fs.getVolumes()) {
+ try {
+if (getAccumuloPersistentVersion(fs) ==
ServerConstants.PREV_DATA_VERSION) {
+ log.debug(Attempting to upgrade + volume);
+ Path dataVersionLocation =
ServerConstants.getDataVersionLocation(volume);
+ fs.create(new Path(dataVersionLocation,
Integer.toString(ServerConstants.DATA_VERSION))).close();
+
+ Path prevDataVersionLoc = new Path(dataVersionLocation,
Integer.toString(ServerConstants.PREV_DATA_VERSION));
+ if (!fs.delete(prevDataVersionLoc)) {
+throw new RuntimeException(Could not delete previous data version
location ( + prevDataVersionLoc + ) for + volume);
+ }
+}
+ } catch (IOException e) {
+throw new RuntimeException(Unable to set accumulo version: an error
occurred., e);
}
-} catch (IOException e) {
- throw new RuntimeException(Unable to set accumulo version: an error
occurred., e);
}
}
[04/26] git commit: ACCUMULO-2061 Formatting fixes
ACCUMULO-2061 Formatting fixes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/575e5418
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/575e5418
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/575e5418
Branch: refs/heads/ACCUMULO-2061
Commit: 575e54182f06ba19290e6a6f72c983dc189a42c1
Parents: 4ddaab8
Author: Josh Elser els...@apache.org
Authored: Wed Mar 12 12:12:05 2014 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Mar 12 12:12:05 2014 -0400
--
.../org/apache/accumulo/core/volume/Volume.java | 4 +--
.../core/volume/VolumeConfiguration.java| 27 +++-
.../apache/accumulo/core/volume/VolumeImpl.java | 19 +++---
.../accumulo/server/fs/VolumeManager.java | 2 --
.../accumulo/server/fs/VolumeManagerImpl.java | 19 +++---
.../apache/accumulo/server/fs/VolumeUtil.java | 2 +-
.../accumulo/server/fs/VolumeUtilTest.java | 2 +-
7 files changed, 38 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/575e5418/core/src/main/java/org/apache/accumulo/core/volume/Volume.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/volume/Volume.java
b/core/src/main/java/org/apache/accumulo/core/volume/Volume.java
index 08f61d4..487b699 100644
--- a/core/src/main/java/org/apache/accumulo/core/volume/Volume.java
+++ b/core/src/main/java/org/apache/accumulo/core/volume/Volume.java
@@ -21,7 +21,7 @@ import org.apache.hadoop.fs.Path;
/**
* Encapsulates a {@link FileSystem} and a base {@link Path} within that
filesystem. This
- * also avoid the necessity to pass around a Configuration.
+ * also avoid the necessity to pass around a Configuration.
*/
public interface Volume {
@@ -36,7 +36,7 @@ public interface Volume {
* @return
*/
public String getBasePath();
-
+
/**
* Convert the given Path into a Path that is relative to the base path for
this Volume
* @param p
http://git-wip-us.apache.org/repos/asf/accumulo/blob/575e5418/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
index 3005174..33d3c35 100644
---
a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
@@ -30,10 +30,10 @@ import org.apache.hadoop.fs.Path;
import com.google.common.base.Preconditions;
public class VolumeConfiguration {
-
+
public static Volume getVolume(String path, Configuration conf,
AccumuloConfiguration acuconf) throws IOException {
Preconditions.checkNotNull(path);
-
+
if (path.contains(:)) {
// An absolute path
return create(new Path(path), conf);
@@ -64,7 +64,7 @@ public class VolumeConfiguration {
String singleNamespace = conf.get(Property.INSTANCE_DFS_DIR);
String dfsUri = conf.get(Property.INSTANCE_DFS_URI);
String baseDir;
-
+
if (dfsUri == null || dfsUri.isEmpty()) {
Configuration hadoopConfig = CachedConfiguration.getInstance();
try {
@@ -82,14 +82,15 @@ public class VolumeConfiguration {
/**
* Compute the URIs to be used by Accumulo
+ *
* @param conf
* @return
*/
public static String[] getVolumeUris(AccumuloConfiguration conf) {
String ns = conf.get(Property.INSTANCE_VOLUMES);
-
+
String configuredBaseDirs[];
-
+
if (ns == null || ns.isEmpty()) {
// Fall back to using the old config values
configuredBaseDirs = new String[] {getConfiguredBaseDir(conf)};
@@ -101,7 +102,7 @@ public class VolumeConfiguration {
if (!namespace.contains(:)) {
throw new IllegalArgumentException(Expected fully qualified URI for
+ Property.INSTANCE_VOLUMES.getKey() + got + namespace);
}
-
+
try {
// pass through URI to unescape hex encoded chars (e.g. convert %2C
to , char)
configuredBaseDirs[i++] = new Path(new URI(namespace)).toString();
@@ -110,7 +111,7 @@ public class VolumeConfiguration {
}
}
}
-
+
return configuredBaseDirs;
}
@@ -126,24 +127,26 @@ public class VolumeConfiguration {
/**
* Create a Volume with the given FileSystem that writes to the default path
- * @param fs A FileSystem to write to
- * @return A Volume instance writing to the given FileSystem in the default
path
+ *
+ * @param fs
+ * A FileSystem to write to
+ * @return A Volume instance writing to the given
[07/26] git commit: Merge branch '1.6.0-SNAPSHOT' into ACCUMULO-2061
Merge branch '1.6.0-SNAPSHOT' into ACCUMULO-2061 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/96182f93 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/96182f93 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/96182f93 Branch: refs/heads/ACCUMULO-2061 Commit: 96182f93f3105b047c63206c702a5313e9ca5535 Parents: 7cb3b23 6dd1bd3 Author: Josh Elser els...@apache.org Authored: Wed Mar 12 13:01:05 2014 -0400 Committer: Josh Elser els...@apache.org Committed: Wed Mar 12 13:01:05 2014 -0400 -- init/src/main/packaging/etc/accumulo/tracers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[06/26] git commit: ACCUMULO-2267 use the localhost convention for the tracer, too
ACCUMULO-2267 use the localhost convention for the tracer, too Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6dd1bd3e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6dd1bd3e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6dd1bd3e Branch: refs/heads/ACCUMULO-2061 Commit: 6dd1bd3e9a51e4ca32fe6795f9448c7f12eaca2b Parents: 0930732 Author: Eric Newton eric.new...@gmail.com Authored: Wed Mar 12 12:41:43 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Wed Mar 12 12:41:43 2014 -0400 -- init/src/main/packaging/etc/accumulo/tracers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6dd1bd3e/init/src/main/packaging/etc/accumulo/tracers -- diff --git a/init/src/main/packaging/etc/accumulo/tracers b/init/src/main/packaging/etc/accumulo/tracers index 09697dc..c319fb3 100644 --- a/init/src/main/packaging/etc/accumulo/tracers +++ b/init/src/main/packaging/etc/accumulo/tracers @@ -12,4 +12,4 @@ # 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. - +localhost
[16/26] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58535fcb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58535fcb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58535fcb
Branch: refs/heads/ACCUMULO-2061
Commit: 58535fcb3e2dfe2bc5d424947924f95d97a645b5
Parents: bf0b7f7 ea86b44
Author: Bill Havanki bhava...@cloudera.com
Authored: Thu Mar 13 10:40:15 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Thu Mar 13 10:40:15 2014 -0400
--
.../apache/accumulo/test/randomwalk/security/SecurityFixture.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/58535fcb/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
--
diff --cc
test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
index a6661ea,000..26620a4
mode 100644,00..100644
---
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
+++
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
@@@ -1,101 -1,0 +1,103 @@@
+/*
+ * 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.randomwalk.security;
+
+import java.net.InetAddress;
+import java.util.Set;
+
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.CredentialHelper;
+import org.apache.accumulo.core.security.SystemPermission;
+import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.test.randomwalk.Fixture;
+import org.apache.accumulo.test.randomwalk.State;
+
+public class SecurityFixture extends Fixture {
+
+ @Override
+ public void setUp(State state) throws Exception {
+String secTableName, systemUserName, tableUserName;
+Connector conn = state.getConnector();
+
+String hostname =
InetAddress.getLocalHost().getHostName().replaceAll([-.], _);
+
+systemUserName = String.format(system_%s, hostname);
+tableUserName = String.format(table_%s, hostname);
+secTableName = String.format(security_%s, hostname);
+
+if (conn.tableOperations().exists(secTableName))
+ conn.tableOperations().delete(secTableName);
+SetString users = conn.securityOperations().listLocalUsers();
+if (users.contains(tableUserName))
+ conn.securityOperations().dropLocalUser(tableUserName);
+if (users.contains(systemUserName))
+ conn.securityOperations().dropLocalUser(systemUserName);
+
+PasswordToken sysUserPass = new PasswordToken(sysUser);
+conn.securityOperations().createLocalUser(systemUserName, sysUserPass);
+
+WalkingSecurity.get(state).setTableName(secTableName);
+state.set(rootUserPass,
CredentialHelper.extractToken(state.getCredentials()));
+
+WalkingSecurity.get(state).setSysUserName(systemUserName);
+WalkingSecurity.get(state).createUser(systemUserName, sysUserPass);
+
+WalkingSecurity.get(state).changePassword(tableUserName, new
PasswordToken(new byte[0]));
+
+WalkingSecurity.get(state).setTabUserName(tableUserName);
+
+for (TablePermission tp : TablePermission.values()) {
+ WalkingSecurity.get(state).revokeTablePermission(systemUserName,
secTableName, tp);
+ WalkingSecurity.get(state).revokeTablePermission(tableUserName,
secTableName, tp);
+}
+for (SystemPermission sp : SystemPermission.values()) {
+ WalkingSecurity.get(state).revokeSystemPermission(systemUserName, sp);
+ WalkingSecurity.get(state).revokeSystemPermission(tableUserName, sp);
+}
+
[12/26] git commit: ACCUMULO-2061 ref an actual ticket in the todo
ACCUMULO-2061 ref an actual ticket in the todo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5db49974
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5db49974
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5db49974
Branch: refs/heads/ACCUMULO-2061
Commit: 5db49974d2ba5e80103adeb7d6321d2b240285ec
Parents: 4b8a14e
Author: Josh Elser els...@apache.org
Authored: Wed Mar 12 16:40:35 2014 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Mar 12 16:40:35 2014 -0400
--
.../main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5db49974/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
index 7c0f067..7ed8f34 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
@@ -52,7 +52,7 @@ public class PrintInfo {
@SuppressWarnings(deprecation)
AccumuloConfiguration aconf = AccumuloConfiguration.getSiteConfiguration();
-// TODO This will only work for RFiles in HDFS when the filesystem is
defined in the core-site.xml
+// TODO ACCUMULO-2462 This will only work for RFiles in HDFS when the
filesystem is defined in the core-site.xml
// on the classpath if a path, and not a URI, is given
FileSystem hadoopFs = VolumeConfiguration.getDefaultVolume(conf,
aconf).getFileSystem();
FileSystem localFs = FileSystem.getLocal(conf);
[21/26] git commit: ACCUMULO-2472 update readme to list conditional mutations as part of API
ACCUMULO-2472 update readme to list conditional mutations as part of API Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3172ac7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3172ac7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3172ac7 Branch: refs/heads/ACCUMULO-2061 Commit: a3172ac7d71a4227d2f0d55438387156ad5c27cc Parents: ec36ce0 Author: Keith Turner ktur...@apache.org Authored: Thu Mar 13 19:27:07 2014 -0400 Committer: Keith Turner ktur...@apache.org Committed: Thu Mar 13 19:27:07 2014 -0400 -- README | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3172ac7/README -- diff --git a/README b/README index 69aad57..66c4df0 100644 --- a/README +++ b/README @@ -358,8 +358,9 @@ redirected to the log dir. The public accumulo API is composed of : * everything under org.apache.accumulo.core.client, excluding impl packages - * Key, Mutation, Value, and Range in org.apache.accumulo.core.data. - * org.apache.accumulo.server.mini + * Key, Mutation, Value, Range, Condition, and ConditionalMutation in + org.apache.accumulo.core.data. + * org.apache.accumulo.server.mini, excluding impl package To get started using accumulo review the example and the javadoc for the packages and classes mentioned above.
[25/26] git commit: Merge branch '1.6.0-SNAPSHOT' into ACCUMULO-2061
Merge branch '1.6.0-SNAPSHOT' into ACCUMULO-2061 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b4d5035 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b4d5035 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b4d5035 Branch: refs/heads/ACCUMULO-2061 Commit: 0b4d50358b3edfa0e42ecd9902c99ce2cdc8bedf Parents: 5db4997 7c2a552 Author: Josh Elser els...@apache.org Authored: Fri Mar 14 14:00:57 2014 -0400 Committer: Josh Elser els...@apache.org Committed: Fri Mar 14 14:00:57 2014 -0400 -- README | 5 +- .../accumulo/core/data/ArrayByteSequence.java | 7 +- .../apache/accumulo/core/data/KeyExtent.java| 3 +- .../core/security/NamespacePermission.java | 1 + .../core/data/ArrayByteSequenceTest.java| 107 + .../accumulo/core/data/ByteSequenceTest.java| 41 .../apache/accumulo/core/data/ColumnTest.java | 70 -- .../accumulo/core/data/KeyExtentTest.java | 240 ++- .../org/apache/accumulo/core/data/KeyTest.java | 33 +++ .../iterators/user/BigDecimalCombinerTest.java | 91 +-- .../core/iterators/user/CombinerTest.java | 2 +- .../core/security/ColumnVisibilityTest.java | 34 ++- .../core/security/NamespacePermissionsTest.java | 39 +++ .../core/security/VisibilityConstraintTest.java | 106 pom.xml | 7 + .../tserver/TabletServerResourceManager.java| 19 +- .../randomwalk/security/SecurityFixture.java| 2 + .../test/MasterRepairsDualAssignmentIT.java | 3 + 18 files changed, 697 insertions(+), 113 deletions(-) --
[05/26] git commit: ACCUMULO-2061 Stop recomputing the same thing 3 times
ACCUMULO-2061 Stop recomputing the same thing 3 times
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7cb3b23a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7cb3b23a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7cb3b23a
Branch: refs/heads/ACCUMULO-2061
Commit: 7cb3b23ab4aed63547ad2d5be964e61b27e7fc47
Parents: 575e541
Author: Josh Elser els...@apache.org
Authored: Wed Mar 12 12:13:25 2014 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Mar 12 12:13:25 2014 -0400
--
.../java/org/apache/accumulo/server/util/ChangeSecret.java| 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7cb3b23a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
index 3f33a0e..f0dcd14 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
@@ -146,9 +146,10 @@ public class ChangeSecret {
private static void updateHdfs(VolumeManager fs, Instance inst, String
newInstanceId) throws IOException {
// Need to recreate the instanceId on all of them to keep consistency
for (Volume v : fs.getVolumes()) {
- v.getFileSystem().delete(ServerConstants.getInstanceIdLocation(v), true);
- v.getFileSystem().mkdirs(ServerConstants.getInstanceIdLocation(v));
- v.getFileSystem().create(new
Path(ServerConstants.getInstanceIdLocation(v), newInstanceId)).close();
+ final Path instanceId = ServerConstants.getInstanceIdLocation(v);
+ v.getFileSystem().delete(instanceId, true);
+ v.getFileSystem().mkdirs(instanceId);
+ v.getFileSystem().create(new Path(instanceId, newInstanceId)).close();
}
}
[14/26] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ed250ab
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7ed250ab
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7ed250ab
Branch: refs/heads/ACCUMULO-2061
Commit: 7ed250ab99c233a4a709a4f59640cf54b921fcaa
Parents: c657c57 bf0b7f7
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Mar 12 16:54:10 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Wed Mar 12 16:54:10 2014 -0400
--
.../tserver/TabletServerResourceManager.java | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7ed250ab/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
--
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index e958437,000..d4bc0fd
mode 100644,00..100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@@ -1,717 -1,0 +1,722 @@@
+/*
+ * 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.tserver;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.file.blockfile.cache.LruBlockCache;
+import org.apache.accumulo.core.metadata.schema.DataFileValue;
+import org.apache.accumulo.core.util.Daemon;
+import org.apache.accumulo.core.util.LoggingRunnable;
+import org.apache.accumulo.core.util.NamingThreadFactory;
+import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.server.conf.ServerConfiguration;
+import org.apache.accumulo.server.fs.FileRef;
+import org.apache.accumulo.server.fs.VolumeManager;
+import org.apache.accumulo.server.tabletserver.LargestFirstMemoryManager;
+import org.apache.accumulo.server.tabletserver.MemoryManagementActions;
+import org.apache.accumulo.server.tabletserver.MemoryManager;
+import org.apache.accumulo.server.tabletserver.TabletState;
+import org.apache.accumulo.server.util.time.SimpleTimer;
+import org.apache.accumulo.trace.instrument.TraceExecutorService;
+import org.apache.accumulo.tserver.FileManager.ScanFileManager;
+import org.apache.accumulo.tserver.Tablet.MinorCompactionReason;
+import org.apache.accumulo.tserver.compaction.CompactionStrategy;
+import org.apache.accumulo.tserver.compaction.DefaultCompactionStrategy;
+import org.apache.accumulo.tserver.compaction.MajorCompactionReason;
+import org.apache.accumulo.tserver.compaction.MajorCompactionRequest;
+import org.apache.log4j.Logger;
+
+/**
+ * ResourceManager is responsible for managing the resources of all tablets
within a tablet server.
+ *
+ *
+ *
+ */
+public class TabletServerResourceManager {
+
+ private ExecutorService minorCompactionThreadPool;
+ private ExecutorService majorCompactionThreadPool;
+ private ExecutorService rootMajorCompactionThreadPool;
+ private
[03/26] git commit: ACCUMULO-2061 Add a warning about using paths with PrintInfo
ACCUMULO-2061 Add a warning about using paths with PrintInfo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4ddaab80
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ddaab80
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ddaab80
Branch: refs/heads/ACCUMULO-2061
Commit: 4ddaab80828c2b0596cd6d63566b83844945d83a
Parents: 7086a7e
Author: Josh Elser els...@apache.org
Authored: Wed Mar 12 12:11:48 2014 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Mar 12 12:11:48 2014 -0400
--
.../java/org/apache/accumulo/core/file/rfile/PrintInfo.java | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ddaab80/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
index 4e39fc7..7c0f067 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
@@ -31,10 +31,12 @@ import org.apache.accumulo.core.volume.VolumeConfiguration;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.log4j.Logger;
import com.beust.jcommander.Parameter;
public class PrintInfo {
+ private static final Logger log = Logger.getLogger(PrintInfo.class);
static class Opts extends Help {
@Parameter(names = {-d, --dump}, description = dump the key/value
pairs)
@@ -50,6 +52,8 @@ public class PrintInfo {
@SuppressWarnings(deprecation)
AccumuloConfiguration aconf = AccumuloConfiguration.getSiteConfiguration();
+// TODO This will only work for RFiles in HDFS when the filesystem is
defined in the core-site.xml
+// on the classpath if a path, and not a URI, is given
FileSystem hadoopFs = VolumeConfiguration.getDefaultVolume(conf,
aconf).getFileSystem();
FileSystem localFs = FileSystem.getLocal(conf);
Opts opts = new Opts();
@@ -68,8 +72,11 @@ public class PrintInfo {
FileSystem fs;
if (arg.contains(:))
fs = path.getFileSystem(conf);
- else
+ else {
+// Recommend a URI is given for the above todo reason
+log.warn(Attempting to find file across filesystems. Consider
providing URI instead of path);
fs = hadoopFs.exists(path) ? hadoopFs : localFs; // fall back to local
+ }
CachableBlockFile.Reader _rdr = new CachableBlockFile.Reader(fs, path,
conf, null, null, aconf);
Reader iter = new RFile.Reader(_rdr);
[15/26] git commit: ACCUMULO-2194 Add delay for randomwalk Security teardown
ACCUMULO-2194 Add delay for randomwalk Security teardown
If two Security randomwalk tests run back-to-back, the second test may see that
the
table user still exists even though it was removed when the first test was torn
down.
This can happen if the user drop does not propagate through Zookeeper quickly
enough.
This commit adds a delay to the end of the Security test to give ZK some time.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ea86b44d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ea86b44d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ea86b44d
Branch: refs/heads/ACCUMULO-2061
Commit: ea86b44dfd6f46d389a630beb33ac49b65d87cd7
Parents: d11acbe
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Mar 12 10:51:06 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Thu Mar 13 09:30:09 2014 -0400
--
.../accumulo/server/test/randomwalk/security/SecurityFixture.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ea86b44d/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java
b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java
index c20e6db..144140b 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java
@@ -94,5 +94,7 @@ public class SecurityFixture extends Fixture {
log.debug(Dropping user: + systemUserName);
conn.securityOperations().dropUser(systemUserName);
+// Allow user drops to propagate, in case a new security test starts
+Thread.sleep(2000);
}
}
[17/26] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 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/58ec7b1a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58ec7b1a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58ec7b1a Branch: refs/heads/ACCUMULO-2061 Commit: 58ec7b1afa8a586ff8e96f08653f405d2be5a0ff Parents: 7ed250a 58535fc Author: Bill Havanki bhava...@cloudera.com Authored: Thu Mar 13 10:40:56 2014 -0400 Committer: Bill Havanki bhava...@cloudera.com Committed: Thu Mar 13 10:40:56 2014 -0400 -- .../apache/accumulo/test/randomwalk/security/SecurityFixture.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/58ec7b1a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java --
[22/26] git commit: ACCUMULO-2468 Add unit tests for o.a.a.core.data
ACCUMULO-2468 Add unit tests for o.a.a.core.data
Add unit tests for several classes. Convert from JUnit 3 to 4 where
appropriate. Fix bugs where new unit tests uncovered them. Replaced
assertTrue with assertEquals where possible.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e68d748b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e68d748b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e68d748b
Branch: refs/heads/ACCUMULO-2061
Commit: e68d748b02c9d11f57767addb0daec905e10cd31
Parents: a3172ac
Author: Mike Drob md...@cloudera.com
Authored: Wed Mar 12 14:50:14 2014 -0400
Committer: Mike Drob md...@cloudera.com
Committed: Fri Mar 14 10:23:38 2014 -0400
--
.../accumulo/core/data/ArrayByteSequence.java | 7 +-
.../apache/accumulo/core/data/KeyExtent.java| 3 +-
.../core/data/ArrayByteSequenceTest.java| 107 +
.../accumulo/core/data/ByteSequenceTest.java| 41
.../apache/accumulo/core/data/ColumnTest.java | 70 --
.../accumulo/core/data/KeyExtentTest.java | 240 ++-
.../org/apache/accumulo/core/data/KeyTest.java | 33 +++
7 files changed, 416 insertions(+), 85 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68d748b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index ff56c31..ca769cb 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@ -52,12 +52,13 @@ public class ArrayByteSequence extends ByteSequence
implements Serializable {
}
public ArrayByteSequence(ByteBuffer buffer) {
+this.length = buffer.remaining();
+
if (buffer.hasArray()) {
this.data = buffer.array();
- this.offset = buffer.arrayOffset();
- this.length = buffer.limit();
+ this.offset = buffer.position();
} else {
- this.data = new byte[buffer.remaining()];
+ this.data = new byte[length];
this.offset = 0;
buffer.get(data);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68d748b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
index dda78fb..4c9978f 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
@@ -301,9 +301,10 @@ public class KeyExtent implements
WritableComparableKeyExtent {
/**
* Empty start or end rows tell the method there are no start or end rows,
and to use all the keyextents that are before the end row if no start row etc.
*
+ * @deprecated this method not intended for public use and is likely to be
removed in a future version.
* @return all the key extents that the rows cover
*/
-
+ @Deprecated
public static CollectionKeyExtent getKeyExtentsForRange(Text startRow,
Text endRow, SetKeyExtent kes) {
if (kes == null)
return Collections.emptyList();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68d748b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
new file mode 100644
index 000..70c40ed
--- /dev/null
+++
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.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
[08/26] git commit: ACCUMULO-2444 unit tests for a.o.o.core.security
ACCUMULO-2444 unit tests for a.o.o.core.security
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c657c575
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c657c575
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c657c575
Branch: refs/heads/ACCUMULO-2061
Commit: c657c5758a1ab1224abc3377066699eaf826dd62
Parents: 6dd1bd3
Author: Mike Drob md...@cloudera.com
Authored: Mon Mar 10 10:20:36 2014 -0400
Committer: Mike Drob md...@cloudera.com
Committed: Wed Mar 12 16:12:57 2014 -0400
--
.../core/security/NamespacePermission.java | 1 +
.../core/security/ColumnVisibilityTest.java | 34 +-
.../core/security/NamespacePermissionsTest.java | 39 +++
.../core/security/VisibilityConstraintTest.java | 106 +++
4 files changed, 178 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c657c575/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
index f9f7564..44cee0c 100644
---
a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
+++
b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
@@ -80,6 +80,7 @@ public enum NamespacePermission {
* @throws IndexOutOfBoundsException
* if the byte ID is invalid
*/
+ // This method isn't used anywhere, why is it public API?
public static NamespacePermission getPermissionById(byte id) {
NamespacePermission result = mapping[id];
if (result != null)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c657c575/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
index 7a6a80d..931ff41 100644
---
a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
@@ -19,10 +19,16 @@ package org.apache.accumulo.core.security;
import static org.apache.accumulo.core.security.ColumnVisibility.quote;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.util.Comparator;
+
+import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.security.ColumnVisibility.Node;
+import org.apache.accumulo.core.security.ColumnVisibility.NodeComparator;
import org.apache.accumulo.core.security.ColumnVisibility.NodeType;
+import org.apache.hadoop.io.Text;
import org.junit.Test;
public class ColumnVisibilityTest {
@@ -46,8 +52,14 @@ public class ColumnVisibilityTest {
@Test
public void testEmpty() {
// empty visibility is valid
-new ColumnVisibility();
-new ColumnVisibility(new byte[0]);
+ColumnVisibility a = new ColumnVisibility();
+ColumnVisibility b = new ColumnVisibility(new byte[0]);
+ColumnVisibility c = new ColumnVisibility();
+ColumnVisibility d = new ColumnVisibility(new Text());
+
+assertEquals(a, b);
+assertEquals(a, c);
+assertEquals(a, d);
}
@Test
@@ -205,6 +217,24 @@ public class ColumnVisibilityTest {
assertNode(node.getChildren().get(1).children.get(1), NodeType.TERM, 7, 8);
}
+ @Test
+ public void testEmptyParseTreesAreEqual() {
+ComparatorNode comparator = new NodeComparator(new byte[] {});
+Node empty = new ColumnVisibility().getParseTree();
+assertEquals(0, comparator.compare(empty, parse()));
+ }
+
+ @Test
+ public void testParseTreesOrdering() {
+byte[] expression = (bcd)|((a|m)yz)|(ef).getBytes(Constants.UTF8);
+byte[] flattened = new ColumnVisibility(expression).flatten();
+
+// Convert to String for indexOf convenience
+String flat = new String(flattened, Constants.UTF8);
+assertTrue(shortest expressions sort first, flat.indexOf('e')
flat.indexOf('|'));
+assertTrue(shortest children sort first, flat.indexOf('b')
flat.indexOf('a'));
+ }
+
private Node parse(String s) {
ColumnVisibility v = new ColumnVisibility(s);
return v.getParseTree();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c657c575/core/src/test/java/org/apache/accumulo/core/security/NamespacePermissionsTest.java
--
diff --git
[20/26] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 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/ec36ce07 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec36ce07 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec36ce07 Branch: refs/heads/ACCUMULO-2061 Commit: ec36ce07127678d8c1d3e27cb7fa181b578576ec Parents: b66ee24 a99b0b6 Author: Bill Havanki bhava...@cloudera.com Authored: Thu Mar 13 17:04:13 2014 -0400 Committer: Bill Havanki bhava...@cloudera.com Committed: Thu Mar 13 17:04:13 2014 -0400 -- pom.xml | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec36ce07/pom.xml --
[11/26] git commit: ACCUMULO-2061 Only append a trailing slash when one doesn't exist on the base dir
ACCUMULO-2061 Only append a trailing slash when one doesn't exist on the base
dir
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b8a14e3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b8a14e3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b8a14e3
Branch: refs/heads/ACCUMULO-2061
Commit: 4b8a14e38734acb5b8b89c1e1f48acc680b246ac
Parents: 560af51
Author: Josh Elser els...@apache.org
Authored: Wed Mar 12 16:25:19 2014 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Mar 12 16:25:19 2014 -0400
--
.../org/apache/accumulo/core/volume/VolumeConfiguration.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b8a14e3/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
index 5db5bb2..71ad611 100644
---
a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
@@ -123,7 +123,11 @@ public class VolumeConfiguration {
suffix = suffix.substring(1);
String result[] = new String[bases.length];
for (int i = 0; i bases.length; i++) {
- result[i] = bases[i] + / + suffix;
+ if (bases[i].endsWith(/)) {
+result[i] = bases[i] + suffix;
+ } else {
+result[i] = bases[i] + / + suffix;
+ }
}
return result;
}
[24/26] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/7c2a5526 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c2a5526 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c2a5526 Branch: refs/heads/ACCUMULO-2061 Commit: 7c2a5526a1ce9b729e8a14ce9a34b457959bfa5e Parents: ae75062 e68d748 Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 12:55:59 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 12:55:59 2014 -0400 -- README | 5 +- .../accumulo/core/data/ArrayByteSequence.java | 7 +- .../apache/accumulo/core/data/KeyExtent.java| 3 +- .../core/security/NamespacePermission.java | 1 + .../core/data/ArrayByteSequenceTest.java| 107 + .../accumulo/core/data/ByteSequenceTest.java| 41 .../apache/accumulo/core/data/ColumnTest.java | 70 -- .../accumulo/core/data/KeyExtentTest.java | 240 ++- .../org/apache/accumulo/core/data/KeyTest.java | 33 +++ .../iterators/user/BigDecimalCombinerTest.java | 91 +-- .../core/iterators/user/CombinerTest.java | 2 +- .../core/security/ColumnVisibilityTest.java | 34 ++- .../core/security/NamespacePermissionsTest.java | 39 +++ .../core/security/VisibilityConstraintTest.java | 106 pom.xml | 7 + .../tserver/TabletServerResourceManager.java| 19 +- .../randomwalk/security/SecurityFixture.java| 2 + 17 files changed, 694 insertions(+), 113 deletions(-) --
[13/26] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bf0b7f78
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bf0b7f78
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bf0b7f78
Branch: refs/heads/ACCUMULO-2061
Commit: bf0b7f78b52f5d61e84792888ce479c758e4028d
Parents: 43cebf8 d11acbe
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Mar 12 16:49:16 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Wed Mar 12 16:49:16 2014 -0400
--
.../TabletServerResourceManager.java| 21
1 file changed, 13 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bf0b7f78/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
--
diff --cc
server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
index e0dbead,000..57cd49b
mode 100644,00..100644
---
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
+++
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
@@@ -1,803 -1,0 +1,808 @@@
+/*
+ * 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.tabletserver;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.accumulo.trace.instrument.TraceExecutorService;
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.file.blockfile.cache.LruBlockCache;
+import org.apache.accumulo.core.util.Daemon;
+import org.apache.accumulo.core.util.LoggingRunnable;
+import org.apache.accumulo.core.util.MetadataTable.DataFileValue;
+import org.apache.accumulo.core.util.NamingThreadFactory;
+import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.server.conf.ServerConfiguration;
+import org.apache.accumulo.server.tabletserver.FileManager.ScanFileManager;
+import org.apache.accumulo.server.tabletserver.Tablet.MajorCompactionReason;
+import org.apache.accumulo.server.tabletserver.Tablet.MinorCompactionReason;
+import org.apache.accumulo.server.util.time.SimpleTimer;
+import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.log4j.Logger;
+
+/**
+ * ResourceManager is responsible for managing the resources of all tablets
within a tablet server.
+ *
+ *
+ *
+ */
+public class TabletServerResourceManager {
+
+ private ExecutorService minorCompactionThreadPool;
+ private ExecutorService majorCompactionThreadPool;
+ private ExecutorService rootMajorCompactionThreadPool;
+ private ExecutorService defaultMajorCompactionThreadPool;
+ private ExecutorService splitThreadPool;
+ private ExecutorService defaultSplitThreadPool;
+ private ExecutorService defaultMigrationPool;
+ private ExecutorService migrationPool;
+ private ExecutorService assignmentPool;
+ private
[23/26] git commit: ACCUMULO-2475 recovery failed due to using the wrong filesystem
ACCUMULO-2475 recovery failed due to using the wrong filesystem
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae750622
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae750622
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae750622
Branch: refs/heads/ACCUMULO-2061
Commit: ae750622c2baf4761afd9354540383f3b01ab6e2
Parents: 6dd1bd3
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Mar 14 12:55:32 2014 -0400
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Mar 14 12:55:32 2014 -0400
--
.../org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae750622/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
index 86c5004..7cb1fe5 100644
---
a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++
b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -46,6 +46,7 @@ import
org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.test.functional.ConfigurableMacIT;
import org.apache.accumulo.test.functional.FunctionalTestUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.RawLocalFileSystem;
import org.apache.hadoop.io.Text;
import org.junit.Test;
@@ -56,6 +57,8 @@ public class MasterRepairsDualAssignmentIT extends
ConfigurableMacIT {
public void configure(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, 5s);
cfg.setProperty(Property.MASTER_RECOVERY_DELAY, 5s);
+// use raw local file system so walogs sync and flush will work
+hadoopCoreSite.set(fs.file.impl, RawLocalFileSystem.class.getName());
}
@Test(timeout = 5 * 60 * 1000)
[18/26] git commit: ACCUMULO-2465 Unit tests for BigDecimalCombiner
ACCUMULO-2465 Unit tests for BigDecimalCombiner
Add tests for min and max. Refactor setup into @Before method.
Add keys that won't combine to make sure all values are still correct.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b66ee24c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b66ee24c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b66ee24c
Branch: refs/heads/ACCUMULO-2061
Commit: b66ee24cd101aeb1c49b5e6840bfa0e61cc60071
Parents: 58ec7b1
Author: Mike Drob md...@cloudera.com
Authored: Tue Mar 11 12:21:14 2014 -0400
Committer: Mike Drob md...@cloudera.com
Committed: Thu Mar 13 16:10:00 2014 -0400
--
.../iterators/user/BigDecimalCombinerTest.java | 91
.../core/iterators/user/CombinerTest.java | 2 +-
2 files changed, 76 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b66ee24c/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
b/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
index 4cf4d5d..9e3d975 100644
---
a/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
@@ -25,9 +25,11 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import java.util.TreeMap;
import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.IteratorSetting.Column;
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
@@ -35,39 +37,96 @@ import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.Combiner;
import org.apache.accumulo.core.iterators.SortedMapIterator;
import org.apache.accumulo.core.iterators.TypedValueCombiner.Encoder;
+import org.junit.Before;
import org.junit.Test;
public class BigDecimalCombinerTest {
private static final CollectionByteSequence EMPTY_COL_FAMS = new
ArrayListByteSequence();
private static double delta = 0.1;
-
- @Test
- public void testSums() throws IOException {
-EncoderBigDecimal encoder = new BigDecimalCombiner.BigDecimalEncoder();
-
-TreeMapKey,Value tm1 = new TreeMapKey,Value();
-
-// keys that do not aggregate
+ EncoderBigDecimal encoder;
+ TreeMapKey,Value tm1;
+ ListColumn columns;
+ Combiner ai;
+
+
+ @Before
+ public void setup() {
+encoder = new BigDecimalCombiner.BigDecimalEncoder();
+tm1 = new TreeMapKey,Value();
+columns = Collections.singletonList(new IteratorSetting.Column(cf001));
+
+// keys that will aggregate
CombinerTest.nkv(tm1, 1, 1, 1, 1, false, BigDecimal.valueOf(2), encoder);
CombinerTest.nkv(tm1, 1, 1, 1, 2, false, BigDecimal.valueOf(2.3), encoder);
CombinerTest.nkv(tm1, 1, 1, 1, 3, false, BigDecimal.valueOf(-1.4E1),
encoder);
-
-Combiner ai = new BigDecimalCombiner.BigDecimalSummingCombiner();
+
+// and keys that will not aggregate
+CombinerTest.nkv(tm1, 1, 2, 1, 1, false, BigDecimal.valueOf(99), encoder);
+CombinerTest.nkv(tm1, 1, 3, 1, 1, false, BigDecimal.valueOf(-88), encoder);
+ }
+
+ @Test
+ public void testSums() throws IOException {
+ai = new BigDecimalCombiner.BigDecimalSummingCombiner();
IteratorSetting is = new IteratorSetting(1,
BigDecimalCombiner.BigDecimalSummingCombiner.class);
-Combiner.setColumns(is, Collections.singletonList(new
IteratorSetting.Column(cf001)));
+Combiner.setColumns(is, columns);
+
+ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
+ai.seek(new Range(), EMPTY_COL_FAMS, false);
+
+assertTrue(ai.hasTop());
+assertEquals(CombinerTest.nk(1, 1, 1, 3), ai.getTopKey());
+assertEquals(-9.7, encoder.decode(ai.getTopValue().get()).doubleValue(),
delta);
+
+verify();
+ }
+
+ @Test
+ public void testMin() throws IOException {
+ai = new BigDecimalCombiner.BigDecimalMinCombiner();
+IteratorSetting is = new IteratorSetting(1,
BigDecimalCombiner.BigDecimalMinCombiner.class);
+Combiner.setColumns(is, columns);
ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
ai.seek(new Range(), EMPTY_COL_FAMS, false);
-
+
assertTrue(ai.hasTop());
assertEquals(CombinerTest.nk(1, 1, 1, 3), ai.getTopKey());
-assertEquals(-9.7,
encoder.decode(ai.getTopValue().get()).doubleValue(),delta);
-
+assertEquals(-14.0,
[26/26] git commit: ACCUMULO-2061 Use URI instead of FileSystem as the key to find correct Volumes and ensure that absolute URIs are still valid even after they are not configured.
ACCUMULO-2061 Use URI instead of FileSystem as the key to find correct Volumes
and ensure that absolute URIs
are still valid even after they are not configured.
This will help ensure that FileSystem implementations' hashCode and equals don't
have the potential to collide but still provide unique access back to the
Volumes
contained in the FileSystem. Added tests for the NonConfiguredVolume and also
for the no-longer-configured volumes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/de5c29bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de5c29bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de5c29bc
Branch: refs/heads/ACCUMULO-2061
Commit: de5c29bc8f029f85f6abafa903b5dd7a9f84e27a
Parents: 0b4d503
Author: Josh Elser els...@apache.org
Authored: Fri Mar 14 17:06:32 2014 -0400
Committer: Josh Elser els...@apache.org
Committed: Fri Mar 14 17:06:32 2014 -0400
--
.../core/volume/NonConfiguredVolume.java| 92
.../core/volume/NonConfiguredVolumeTest.java| 71 +++
.../accumulo/server/fs/VolumeManagerImpl.java | 25 +++---
.../java/org/apache/accumulo/test/VolumeIT.java | 55 +++-
4 files changed, 231 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/de5c29bc/core/src/main/java/org/apache/accumulo/core/volume/NonConfiguredVolume.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/volume/NonConfiguredVolume.java
b/core/src/main/java/org/apache/accumulo/core/volume/NonConfiguredVolume.java
new file mode 100644
index 000..7dcbd88
--- /dev/null
+++
b/core/src/main/java/org/apache/accumulo/core/volume/NonConfiguredVolume.java
@@ -0,0 +1,92 @@
+/*
+ * 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.volume;
+
+import java.io.IOException;
+
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.util.CachedConfiguration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.log4j.Logger;
+
+/**
+ * Volume implementation which represents a Volume for which we have a
FileSystem
+ * but no base path because it is not configured via {@link
Property#INSTANCE_VOLUMES}
+ *
+ * This is useful to handle volumes that have been removed from
accumulo-site.xml but references
+ * to these volumes have not been updated. This Volume should never be used to
create new files,
+ * only to read existing files.
+ */
+public class NonConfiguredVolume implements Volume {
+ private static final Logger log =
Logger.getLogger(NonConfiguredVolume.class);
+
+ private FileSystem fs;
+
+ public NonConfiguredVolume(FileSystem fs) {
+this.fs = fs;
+ }
+
+ @Override
+ public FileSystem getFileSystem() {
+return fs;
+ }
+
+ @Override
+ public String getBasePath() {
+throw new UnsupportedOperationException(No base path known because this
volume isn't configured in accumulo-site.xml);
+ }
+
+ @Override
+ public Path prefixChild(Path p) {
+throw new UnsupportedOperationException(Cannot prefix path because this
volume isn't configured in accumulo-site.xml);
+ }
+
+ @Override
+ public Path prefixChild(String p) {
+throw new UnsupportedOperationException(Cannot prefix path because this
volume isn't configured in accumulo-site.xml);
+ }
+
+ @Override
+ public boolean isValidPath(Path p) {
+try {
+ return fs.equals(p.getFileSystem(CachedConfiguration.getInstance()));
+} catch (IOException e) {
+ log.debug(Cannot determine FileSystem from path: + p, e);
+}
+return false;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+if (o instanceof NonConfiguredVolume) {
+ NonConfiguredVolume other = (NonConfiguredVolume) o;
+ return this.fs.equals(other.getFileSystem());
+}
+return false;
+ }
+
+ @Override
+ public String toString() {
+return NonConfiguredVolume: + this.fs.toString();
+ }
+
+ @Override
svn commit: r1577778 - /accumulo/site/trunk/content/people.mdtext
Author: busbey Date: Sat Mar 15 04:09:58 2014 New Revision: 158 URL: http://svn.apache.org/r158 Log: Added Hung Pham to contributor list (ACCUMULO-2005) 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=158r1=157r2=158view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Sat Mar 15 04:09:58 2014 @@ -86,6 +86,7 @@ Contributors trtdetcoleman/tdtdEd Coleman/tdtd/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr trtd/tdtdEd Kohlwey/tdtda href=http://www.boozallen.com/Booz Allen Hamilton/a/tdtd/td/tr trtdedwardyoon/tdtdEdward Yoon/tdtd/tdtd/td/tr + trtd/tdtdHung Pham/tdtda href=http://www.cloudera.com/;Cloudera/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr trtdjaredwinick/tdtdJared Winick/tdtda href=http://www.koverse.com;Koverse/a/tdtdMT (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/mst.html-7/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/mdt.html-6/a)/td/tr trtd/tdtdJason Then/tdtd/tdtd/td/tr trtd/tdtdJay Shipper/tdtd/tdtd/td/tr
svn commit: r901656 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot
Date: Sat Mar 15 04:10:54 2014
New Revision: 901656
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 Sat Mar 15 04:10:54 2014
@@ -1 +1 @@
-1577646
+158
Modified: websites/staging/accumulo/trunk/content/people.html
==
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Sat Mar 15 04:10:54 2014
@@ -157,6 +157,7 @@ tr:nth-child(2n+1) {
trtdetcoleman/tdtdEd Coleman/tdtd/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
trtd/tdtdEd Kohlwey/tdtda href=http://www.boozallen.com/Booz
Allen Hamilton/a/tdtd/td/tr
trtdedwardyoon/tdtdEdward Yoon/tdtd/tdtd/td/tr
+ trtd/tdtdHung Pham/tdtda
href=http://www.cloudera.com/;Cloudera/a/tdtdET (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr
trtdjaredwinick/tdtdJared Winick/tdtda
href=http://www.koverse.com;Koverse/a/tdtdMT (a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/mst.html-7/a
/ a
href=http://www.timeanddate.com/library/abbreviations/timezones/na/mdt.html-6/a)/td/tr
trtd/tdtdJason Then/tdtd/tdtd/td/tr
trtd/tdtdJay Shipper/tdtd/tdtd/td/tr
svn commit: r901658 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/
Author: busbey Date: Sat Mar 15 04:12:24 2014 New Revision: 901658 Log: Publishing svnmucc operation to accumulo site by busbey Added: websites/production/accumulo/content/ - copied from r901657, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r901657, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r901657, websites/production/accumulo/content/1.5/apidocs/
