[01/11] ACCUMULO-1880 create mapreduce module
Repository: accumulo Updated Branches: refs/heads/master a8577a1c5 -> 99baad37e http://git-wip-us.apache.org/repos/asf/accumulo/blob/99baad37/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java -- diff --git a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java new file mode 100644 index 000..dd531c0 --- /dev/null +++ b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.core.client.mapreduce; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.hadoop.mapreduce.InputSplit; +import org.apache.hadoop.mapreduce.JobContext; + +/** + * AccumuloInputFormat which returns an "empty" RangeInputSplit + */ +public class EmptySplitsAccumuloInputFormat extends AccumuloInputFormat { + + @Override + public List getSplits(JobContext context) throws IOException { +List oldSplits = super.getSplits(context); +List newSplits = new ArrayList(oldSplits.size()); + +// Copy only the necessary information +for (InputSplit oldSplit : oldSplits) { + org.apache.accumulo.core.client.mapreduce.RangeInputSplit newSplit = new org.apache.accumulo.core.client.mapreduce.RangeInputSplit( + (org.apache.accumulo.core.client.mapreduce.RangeInputSplit) oldSplit); + newSplits.add(newSplit); +} + +return newSplits; + } +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/99baad37/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java -- diff --git a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java new file mode 100644 index 000..7f5c7d8 --- /dev/null +++ b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.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.client.mapreduce; + +import static org.junit.Assert.assertEquals; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.accumulo.core.client.IteratorSetting; +import org.apache.accumulo.core.client.mapreduce.InputTableConfig; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.util.Pair; +import org.apache.hadoop.io.Text; +import org.junit.Before; +import org.junit.Test; + +public class InputTableConfigTest { + + private InputTableConfig tableQueryConfig; + + @Before + public void setUp() { +tableQueryConfig = new InputTableConfig(); + } + + @Test + public void testSerialization_OnlyTable() throws IOException { +byte[] serialized = serialize(tableQueryConfig); +InputTableConfig actualConfig = deserialize(serialized); + +assertEquals
[01/11] Revert "ACCUMULO-1880 create mapreduce module"
Repository: accumulo Updated Branches: refs/heads/master 4dfcb9dec -> a8577a1c5 http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8577a1c/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java -- diff --git a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java deleted file mode 100644 index dd531c0..000 --- a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.accumulo.core.client.mapreduce; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.hadoop.mapreduce.InputSplit; -import org.apache.hadoop.mapreduce.JobContext; - -/** - * AccumuloInputFormat which returns an "empty" RangeInputSplit - */ -public class EmptySplitsAccumuloInputFormat extends AccumuloInputFormat { - - @Override - public List getSplits(JobContext context) throws IOException { -List oldSplits = super.getSplits(context); -List newSplits = new ArrayList(oldSplits.size()); - -// Copy only the necessary information -for (InputSplit oldSplit : oldSplits) { - org.apache.accumulo.core.client.mapreduce.RangeInputSplit newSplit = new org.apache.accumulo.core.client.mapreduce.RangeInputSplit( - (org.apache.accumulo.core.client.mapreduce.RangeInputSplit) oldSplit); - newSplits.add(newSplit); -} - -return newSplits; - } -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8577a1c/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java -- diff --git a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java deleted file mode 100644 index 7f5c7d8..000 --- a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.accumulo.core.client.mapreduce; - -import static org.junit.Assert.assertEquals; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.accumulo.core.client.IteratorSetting; -import org.apache.accumulo.core.client.mapreduce.InputTableConfig; -import org.apache.accumulo.core.data.Range; -import org.apache.accumulo.core.util.Pair; -import org.apache.hadoop.io.Text; -import org.junit.Before; -import org.junit.Test; - -public class InputTableConfigTest { - - private InputTableConfig tableQueryConfig; - - @Before - public void setUp() { -tableQueryConfig = new InputTableConfig(); - } - - @Test - public void testSerialization_OnlyTable() throws IOException { -byte[] serialized = serialize(tableQueryConfig); -InputTableConfig actualConfig = deserialize(serialized); - -asse
git commit: [maven-release-plugin] prepare release 1.6.0
Repository: accumulo Updated Branches: refs/heads/1.6.0-RC3 [created] 901c35857 [maven-release-plugin] prepare release 1.6.0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/901c3585 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/901c3585 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/901c3585 Branch: refs/heads/1.6.0-RC3 Commit: 901c35857ce982f2e4a6f609590a04a7b5a1a815 Parents: 5678e51 Author: Christopher Tubbs Authored: Mon Apr 21 17:44:01 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 17:44:01 2014 -0400 -- assemble/pom.xml| 2 +- core/pom.xml| 2 +- docs/pom.xml| 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml| 2 +- maven-plugin/pom.xml| 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- proxy/pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml | 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml| 2 +- trace/pom.xml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/901c3585/assemble/pom.xml -- diff --git a/assemble/pom.xml b/assemble/pom.xml index 4c84142..9ebd2de 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.6.0-SNAPSHOT +1.6.0 accumulo pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/901c3585/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 2509435..9859f92 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.6.0-SNAPSHOT +1.6.0 accumulo-core Core http://git-wip-us.apache.org/repos/asf/accumulo/blob/901c3585/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 5ceed97..dfc7f80 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.6.0-SNAPSHOT +1.6.0 accumulo-docs pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/901c3585/examples/simple/pom.xml -- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index 35f0540..5403cba 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.6.0-SNAPSHOT +1.6.0 ../../pom.xml accumulo-examples-simple http://git-wip-us.apache.org/repos/asf/accumulo/blob/901c3585/fate/pom.xml -- diff --git a/fate/pom.xml b/fate/pom.xml index a3a7b42..3232c57 100644 --- a/fate/pom.xml +++ b/fate/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.6.0-SNAPSHOT +1.6.0 accumulo-fate Fate http://git-wip-us.apache.org/repos/asf/accumulo/blob/901c3585/maven-plugin/pom.xml -- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 7abb924..990599f 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.6.0-SNAPSHOT +1.6.0 accumulo-maven-plugin maven-plugin http://git-wip-us.apache.org/repos/asf/accumulo/blob/901c3585/minicluster/pom.xml -- diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 0a3967d..a489d5c 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.6.0-SNAPSHOT +1.6.0 accumulo-minicluster MiniCluster http://git-wip-us.apache.org/repos/asf/accumulo/blob/901c3585/pom.xml -- diff --git a/pom.xml b/pom.xml index 133e08e..9d22989 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project - 1.6.0-SNAPSHOT + 1.6.0 pom Apache Accumulo Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify k
[02/12] ACCUMULO-1880 create mapreduce module
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4dfcb9de/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java -- diff --git a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java new file mode 100644 index 000..dd531c0 --- /dev/null +++ b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.core.client.mapreduce; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.hadoop.mapreduce.InputSplit; +import org.apache.hadoop.mapreduce.JobContext; + +/** + * AccumuloInputFormat which returns an "empty" RangeInputSplit + */ +public class EmptySplitsAccumuloInputFormat extends AccumuloInputFormat { + + @Override + public List getSplits(JobContext context) throws IOException { +List oldSplits = super.getSplits(context); +List newSplits = new ArrayList(oldSplits.size()); + +// Copy only the necessary information +for (InputSplit oldSplit : oldSplits) { + org.apache.accumulo.core.client.mapreduce.RangeInputSplit newSplit = new org.apache.accumulo.core.client.mapreduce.RangeInputSplit( + (org.apache.accumulo.core.client.mapreduce.RangeInputSplit) oldSplit); + newSplits.add(newSplit); +} + +return newSplits; + } +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/4dfcb9de/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java -- diff --git a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java new file mode 100644 index 000..7f5c7d8 --- /dev/null +++ b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.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.client.mapreduce; + +import static org.junit.Assert.assertEquals; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.accumulo.core.client.IteratorSetting; +import org.apache.accumulo.core.client.mapreduce.InputTableConfig; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.util.Pair; +import org.apache.hadoop.io.Text; +import org.junit.Before; +import org.junit.Test; + +public class InputTableConfigTest { + + private InputTableConfig tableQueryConfig; + + @Before + public void setUp() { +tableQueryConfig = new InputTableConfig(); + } + + @Test + public void testSerialization_OnlyTable() throws IOException { +byte[] serialized = serialize(tableQueryConfig); +InputTableConfig actualConfig = deserialize(serialized); + +assertEquals(tableQueryConfig, actualConfig); + } + + @Test + public void testSerialization
[2/3] git commit: ACCUMULO-2171 Include missed issues for CHANGES for 1.6.0-RC3
ACCUMULO-2171 Include missed issues for CHANGES for 1.6.0-RC3 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5678e513 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5678e513 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5678e513 Branch: refs/heads/master Commit: 5678e51375c0612a6a73b1ebd592337868954be6 Parents: 49cf302 Author: Christopher Tubbs Authored: Mon Apr 21 17:13:15 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 17:13:15 2014 -0400 -- CHANGES | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5678e513/CHANGES -- diff --git a/CHANGES b/CHANGES index da7f848..04d4b63 100644 --- a/CHANGES +++ b/CHANGES @@ -469,6 +469,7 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2682] - README has duplicate synconclose paragraphs * [ACCUMULO-2686] - MiniAccumuloClusterImpl should be since 1.6.0 * [ACCUMULO-2690] - DfsLogger outputstream short circuiting is never satisfied. +* [ACCUMULO-2695] - Failure while running conditional RW test w/ agitation * [ACCUMULO-2700] - SecurityOperation.authenticateSystemUser fails to properly validate system user ** Improvement
[1/3] git commit: ACCUMULO-2171 Update CHANGES for 1.6.0-RC3
Repository: accumulo Updated Branches: refs/heads/master 36a97ac01 -> 4e819419c ACCUMULO-2171 Update CHANGES for 1.6.0-RC3 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/49cf3028 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/49cf3028 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/49cf3028 Branch: refs/heads/master Commit: 49cf3028d878fd4538cd4589190e49046a138e4b Parents: 6ea1ead Author: Christopher Tubbs Authored: Mon Apr 21 16:58:35 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 16:58:35 2014 -0400 -- CHANGES | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/49cf3028/CHANGES -- diff --git a/CHANGES b/CHANGES index ef674a6..da7f848 100644 --- a/CHANGES +++ b/CHANGES @@ -140,6 +140,7 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2585] - WriteAheadLogIT.test times out * [ACCUMULO-2605] - TServerUtilsTest.testStopTServer_ES fails with class not found * [ACCUMULO-2620] - org.apache.accumulo.core.client.TableExistsException: Table run exists +* [ACCUMULO-2680] - BackupMasterIT timing too tight ** Bug * [ACCUMULO-324] - System/site constraints and iterators should NOT affect the METADATA table @@ -463,6 +464,12 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2665] - NoClassDefFound building against Hadoop 2.4.0 * [ACCUMULO-2667] - annoying log message * [ACCUMULO-2668] - slow WAL writes +* [ACCUMULO-2671] - BlockedOutputStream can hit a StackOverflowError +* [ACCUMULO-2675] - TestClientOpts is creating files in /tmp +* [ACCUMULO-2682] - README has duplicate synconclose paragraphs +* [ACCUMULO-2686] - MiniAccumuloClusterImpl should be since 1.6.0 +* [ACCUMULO-2690] - DfsLogger outputstream short circuiting is never satisfied. +* [ACCUMULO-2700] - SecurityOperation.authenticateSystemUser fails to properly validate system user ** Improvement * [ACCUMULO-112] - Investigate partitioning in memory map by locality group @@ -580,6 +587,7 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2499] - User manual should include list of default ports * [ACCUMULO-2521] - Expose FATE admin utility by name under bin/accumulo * [ACCUMULO-2528] - OfflineScanner is not volume-aware +* [ACCUMULO-2529] - bake desired warnings into normal maven build * [ACCUMULO-2592] - Add new interfaces that better allow extension/implementations of Accumulo clusters ** New Feature @@ -634,6 +642,7 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2652] - Build warnings from missing plugin version * [ACCUMULO-2653] - Remove useless javadocs * [ACCUMULO-2670] - Corrupt license header in shelltest.txt +* [ACCUMULO-2697] - Automatically run findbugs to detect serious issues in the build ** Test * [ACCUMULO-1981] - BloomFilterLayerLookupTest does not run
[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/4e819419 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e819419 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e819419 Branch: refs/heads/master Commit: 4e819419cddcc12c1400194f8c91526e13752d81 Parents: 36a97ac 5678e51 Author: Christopher Tubbs Authored: Mon Apr 21 17:13:52 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 17:13:52 2014 -0400 -- CHANGES | 10 ++ 1 file changed, 10 insertions(+) --
git commit: ACCUMULO-2171 Include missed issues for CHANGES for 1.6.0-RC3
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 49cf3028d -> 5678e5137 ACCUMULO-2171 Include missed issues for CHANGES for 1.6.0-RC3 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5678e513 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5678e513 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5678e513 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 5678e51375c0612a6a73b1ebd592337868954be6 Parents: 49cf302 Author: Christopher Tubbs Authored: Mon Apr 21 17:13:15 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 17:13:15 2014 -0400 -- CHANGES | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5678e513/CHANGES -- diff --git a/CHANGES b/CHANGES index da7f848..04d4b63 100644 --- a/CHANGES +++ b/CHANGES @@ -469,6 +469,7 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2682] - README has duplicate synconclose paragraphs * [ACCUMULO-2686] - MiniAccumuloClusterImpl should be since 1.6.0 * [ACCUMULO-2690] - DfsLogger outputstream short circuiting is never satisfied. +* [ACCUMULO-2695] - Failure while running conditional RW test w/ agitation * [ACCUMULO-2700] - SecurityOperation.authenticateSystemUser fails to properly validate system user ** Improvement
git commit: ACCUMULO-2171 Update CHANGES for 1.6.0-RC3
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 6ea1ead4e -> 49cf3028d ACCUMULO-2171 Update CHANGES for 1.6.0-RC3 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/49cf3028 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/49cf3028 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/49cf3028 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 49cf3028d878fd4538cd4589190e49046a138e4b Parents: 6ea1ead Author: Christopher Tubbs Authored: Mon Apr 21 16:58:35 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 16:58:35 2014 -0400 -- CHANGES | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/49cf3028/CHANGES -- diff --git a/CHANGES b/CHANGES index ef674a6..da7f848 100644 --- a/CHANGES +++ b/CHANGES @@ -140,6 +140,7 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2585] - WriteAheadLogIT.test times out * [ACCUMULO-2605] - TServerUtilsTest.testStopTServer_ES fails with class not found * [ACCUMULO-2620] - org.apache.accumulo.core.client.TableExistsException: Table run exists +* [ACCUMULO-2680] - BackupMasterIT timing too tight ** Bug * [ACCUMULO-324] - System/site constraints and iterators should NOT affect the METADATA table @@ -463,6 +464,12 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2665] - NoClassDefFound building against Hadoop 2.4.0 * [ACCUMULO-2667] - annoying log message * [ACCUMULO-2668] - slow WAL writes +* [ACCUMULO-2671] - BlockedOutputStream can hit a StackOverflowError +* [ACCUMULO-2675] - TestClientOpts is creating files in /tmp +* [ACCUMULO-2682] - README has duplicate synconclose paragraphs +* [ACCUMULO-2686] - MiniAccumuloClusterImpl should be since 1.6.0 +* [ACCUMULO-2690] - DfsLogger outputstream short circuiting is never satisfied. +* [ACCUMULO-2700] - SecurityOperation.authenticateSystemUser fails to properly validate system user ** Improvement * [ACCUMULO-112] - Investigate partitioning in memory map by locality group @@ -580,6 +587,7 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2499] - User manual should include list of default ports * [ACCUMULO-2521] - Expose FATE admin utility by name under bin/accumulo * [ACCUMULO-2528] - OfflineScanner is not volume-aware +* [ACCUMULO-2529] - bake desired warnings into normal maven build * [ACCUMULO-2592] - Add new interfaces that better allow extension/implementations of Accumulo clusters ** New Feature @@ -634,6 +642,7 @@ Release Notes - Accumulo - Version 1.6.0 * [ACCUMULO-2652] - Build warnings from missing plugin version * [ACCUMULO-2653] - Remove useless javadocs * [ACCUMULO-2670] - Corrupt license header in shelltest.txt +* [ACCUMULO-2697] - Automatically run findbugs to detect serious issues in the build ** Test * [ACCUMULO-1981] - BloomFilterLayerLookupTest does not run
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Conflicts: server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/36a97ac0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/36a97ac0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/36a97ac0 Branch: refs/heads/master Commit: 36a97ac019165804c2ce27984c9cc15f854ae874 Parents: 3086472 6ea1ead Author: Christopher Tubbs Authored: Mon Apr 21 16:10:14 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 16:10:14 2014 -0400 -- core/pom.xml| 7 + core/src/main/findbugs/exclude-filter.xml | 36 + pom.xml | 26 +++- proxy/pom.xml | 13 ++ proxy/src/main/findbugs/exclude-filter.xml | 21 +++ .../server/security/SecurityOperation.java | 8 +- .../server/security/SystemCredentials.java | 51 --- .../server/security/SystemCredentialsIT.java| 148 +++ trace/pom.xml | 13 ++ trace/src/main/findbugs/exclude-filter.xml | 21 +++ 10 files changed, 313 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/core/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/proxy/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java -- diff --cc server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java index d99f104,b5d7aba..63528a3 --- a/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java @@@ -91,8 -89,9 +90,9 @@@ public final class SystemCredentials ex private SystemToken(byte[] systemPassword) { super(systemPassword); } - - private static SystemToken get() { + + private static SystemToken get(Instance instance) { - byte[] instanceIdBytes = instance.getInstanceID().getBytes(Constants.UTF8); ++ byte[] instanceIdBytes = instance.getInstanceID().getBytes(StandardCharsets.UTF_8); byte[] confChecksum; MessageDigest md; try { @@@ -100,11 -99,11 +100,11 @@@ } catch (NoSuchAlgorithmException e) { throw new RuntimeException("Failed to compute configuration checksum", e); } - + // seed the config with the version and instance id, so at least it's not empty - md.update(ServerConstants.WIRE_VERSION.toString().getBytes(Constants.UTF8)); + md.update(ServerConstants.WIRE_VERSION.toString().getBytes(StandardCharsets.UTF_8)); - md.update(HdfsZooInstance.getInstance().getInstanceID().getBytes(StandardCharsets.UTF_8)); - + md.update(instanceIdBytes); + for (Entry entry : ServerConfiguration.getSiteConfiguration()) { // only include instance properties if (entry.getKey().startsWith(Property.INSTANCE_PREFIX.toString())) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/trace/pom.xml --
[1/4] git commit: ACCUMULO-2697 Look for serious findbug issues in the build
Repository: accumulo Updated Branches: refs/heads/master 3086472f4 -> 36a97ac01 ACCUMULO-2697 Look for serious findbug issues in the build Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e4b08b17 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e4b08b17 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e4b08b17 Branch: refs/heads/master Commit: e4b08b17ff0f42db6ba64f79cd277a918fe6fc23 Parents: b383cc5 Author: Christopher Tubbs Authored: Mon Apr 21 12:18:59 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 15:16:26 2014 -0400 -- core/pom.xml | 7 + core/src/main/findbugs/exclude-filter.xml | 36 + pom.xml| 24 + proxy/pom.xml | 13 + proxy/src/main/findbugs/exclude-filter.xml | 21 +++ trace/pom.xml | 13 + trace/src/main/findbugs/exclude-filter.xml | 21 +++ 7 files changed, 135 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index dbb924d..2509435 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -167,6 +167,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + src/main/findbugs/exclude-filter.xml + + http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/core/src/main/findbugs/exclude-filter.xml -- diff --git a/core/src/main/findbugs/exclude-filter.xml b/core/src/main/findbugs/exclude-filter.xml new file mode 100644 index 000..88b7922 --- /dev/null +++ b/core/src/main/findbugs/exclude-filter.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/pom.xml -- diff --git a/pom.xml b/pom.xml index f109643..d321c55 100644 --- a/pom.xml +++ b/pom.xml @@ -452,6 +452,18 @@ + org.codehaus.mojo + findbugs-maven-plugin + 2.5.3 + +true +Max +true +true +1 + + + com.google.code.sortpom maven-sortpom-plugin 2.3.0 @@ -815,6 +827,18 @@ +org.codehaus.mojo +findbugs-maven-plugin + + +run-findbugs + + check + + + + + org.apache.maven.plugins maven-scm-publish-plugin http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/proxy/pom.xml -- diff --git a/proxy/pom.xml b/proxy/pom.xml index a994e53..d1e0ebb 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -87,6 +87,19 @@ test + + + + + org.codehaus.mojo + findbugs-maven-plugin + + src/main/findbugs/exclude-filter.xml + + + + + thrift http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/proxy/src/main/findbugs/exclude-filter.xml -- diff --git a/proxy/src/main/findbugs/exclude-filter.xml b/proxy/src/main/findbugs/exclude-filter.xml new file mode 100644 index 000..97cf1ef --- /dev/null +++ b/proxy/src/main/findbugs/exclude-filter.xml @@ -0,0 +1,21 @@ + + + + + + http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/trace/pom.xml -- diff --git a/trace/pom.xml b/trace/pom.xml index 8cd6969..0c34dfa 100644 --- a/trace/pom.xml +++ b/trace/pom.xml @@ -53,6 +53,19 @@ test + + + + + org.codehaus.mojo + findbugs-maven-plugin + + src/main/findbugs/exclude-filter.xml + + + + + thrift http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/trace/src/main/findbugs/exclude-filter.xml -- diff --git a/trace/src/main/findbugs/exclude-filter.xml b/trace/src/main/findbugs/exclude-filter.xml new file mode 100644 index 000..408a32c --- /dev/null +++ b/
[2/4] git commit: ACCUMULO-2700 Fix system credentials checks and add a test
ACCUMULO-2700 Fix system credentials checks and add a test Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d2750908 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d2750908 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d2750908 Branch: refs/heads/master Commit: d27509084ff45cef892c5735ee8fb559cd61dc0c Parents: e4b08b1 Author: Christopher Tubbs Authored: Mon Apr 21 15:14:05 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 15:27:53 2014 -0400 -- .../server/security/SecurityOperation.java | 8 +- .../server/security/SystemCredentials.java | 51 --- .../server/security/SystemCredentialsIT.java| 148 +++ 3 files changed, 177 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d2750908/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java -- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java index f8b1702..c2a7001 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java @@ -154,11 +154,11 @@ public class SecurityOperation { if (!credentials.getInstanceId().equals(HdfsZooInstance.getInstance().getInstanceID())) throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.INVALID_INSTANCEID); +AuthenticationToken token = AuthenticationTokenSerializer.deserialize(credentials.getTokenClassName(), credentials.getToken()); if (isSystemUser(credentials)) { - authenticateSystemUser(credentials); + authenticateSystemUserToken(credentials, token); } else { try { -AuthenticationToken token = AuthenticationTokenSerializer.deserialize(credentials.getTokenClassName(), credentials.getToken()); if (!authenticator.authenticateUser(credentials.getPrincipal(), token)) { throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.BAD_CREDENTIALS); } @@ -169,8 +169,8 @@ public class SecurityOperation { } } - private void authenticateSystemUser(TCredentials credentials) throws ThriftSecurityException { -if (SystemCredentials.get().getToken().equals(credentials.getToken())) + private void authenticateSystemUserToken(TCredentials credentials, AuthenticationToken token) throws ThriftSecurityException { +if (!SystemCredentials.get().getToken().equals(token)) throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.BAD_CREDENTIALS); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/d2750908/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java -- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java b/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java index 9b4931d..b5d7aba 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java @@ -43,55 +43,55 @@ import org.apache.hadoop.io.Writable; * @since 1.6.0 */ public final class SystemCredentials extends Credentials { - + private static final SecurityPermission SYSTEM_CREDENTIALS_PERMISSION = new SecurityPermission("systemCredentialsPermission"); - + private static SystemCredentials SYSTEM_CREDS = null; private static final String SYSTEM_PRINCIPAL = "!SYSTEM"; - private static final SystemToken SYSTEM_TOKEN = SystemToken.get(); - + private final TCredentials AS_THRIFT; - - private SystemCredentials() { -super(SYSTEM_PRINCIPAL, SYSTEM_TOKEN); -AS_THRIFT = super.toThrift(HdfsZooInstance.getInstance()); + + SystemCredentials(Instance instance) { +super(SYSTEM_PRINCIPAL, SystemToken.get(instance)); +AS_THRIFT = super.toThrift(instance); } - + public static SystemCredentials get() { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SYSTEM_CREDENTIALS_PERMISSION); } if (SYSTEM_CREDS == null) { - SYSTEM_CREDS = new SystemCredentials(); + SYSTEM_CREDS = new SystemCredentials(HdfsZooInstance.getInstance()); } return SYSTEM_CREDS; } - + @Override public TCredentials toThrift(Instance instance) { if (!AS_THRIFT.getInstanceId().equals(instance.getInstanceID())) thr
[3/4] git commit: ACCUMULO-2171 Include ShellServerIT in minimal/sunny testing
ACCUMULO-2171 Include ShellServerIT in minimal/sunny testing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6ea1ead4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6ea1ead4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6ea1ead4 Branch: refs/heads/master Commit: 6ea1ead4e97ca98fbca4dccf2eb70a58301a5c19 Parents: d275090 Author: Christopher Tubbs Authored: Mon Apr 21 15:24:37 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 15:27:53 2014 -0400 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6ea1ead4/pom.xml -- diff --git a/pom.xml b/pom.xml index d321c55..133e08e 100644 --- a/pom.xml +++ b/pom.xml @@ -1061,7 +1061,7 @@ sunny false -ReadWriteIT,SimpleProxyIT,ExamplesIT +ReadWriteIT,SimpleProxyIT,ExamplesIT,ShellServerIT
[1/3] git commit: ACCUMULO-2697 Look for serious findbug issues in the build
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT b383cc571 -> 6ea1ead4e ACCUMULO-2697 Look for serious findbug issues in the build Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e4b08b17 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e4b08b17 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e4b08b17 Branch: refs/heads/1.6.0-SNAPSHOT Commit: e4b08b17ff0f42db6ba64f79cd277a918fe6fc23 Parents: b383cc5 Author: Christopher Tubbs Authored: Mon Apr 21 12:18:59 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 15:16:26 2014 -0400 -- core/pom.xml | 7 + core/src/main/findbugs/exclude-filter.xml | 36 + pom.xml| 24 + proxy/pom.xml | 13 + proxy/src/main/findbugs/exclude-filter.xml | 21 +++ trace/pom.xml | 13 + trace/src/main/findbugs/exclude-filter.xml | 21 +++ 7 files changed, 135 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index dbb924d..2509435 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -167,6 +167,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + src/main/findbugs/exclude-filter.xml + + http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/core/src/main/findbugs/exclude-filter.xml -- diff --git a/core/src/main/findbugs/exclude-filter.xml b/core/src/main/findbugs/exclude-filter.xml new file mode 100644 index 000..88b7922 --- /dev/null +++ b/core/src/main/findbugs/exclude-filter.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/pom.xml -- diff --git a/pom.xml b/pom.xml index f109643..d321c55 100644 --- a/pom.xml +++ b/pom.xml @@ -452,6 +452,18 @@ + org.codehaus.mojo + findbugs-maven-plugin + 2.5.3 + +true +Max +true +true +1 + + + com.google.code.sortpom maven-sortpom-plugin 2.3.0 @@ -815,6 +827,18 @@ +org.codehaus.mojo +findbugs-maven-plugin + + +run-findbugs + + check + + + + + org.apache.maven.plugins maven-scm-publish-plugin http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/proxy/pom.xml -- diff --git a/proxy/pom.xml b/proxy/pom.xml index a994e53..d1e0ebb 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -87,6 +87,19 @@ test + + + + + org.codehaus.mojo + findbugs-maven-plugin + + src/main/findbugs/exclude-filter.xml + + + + + thrift http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/proxy/src/main/findbugs/exclude-filter.xml -- diff --git a/proxy/src/main/findbugs/exclude-filter.xml b/proxy/src/main/findbugs/exclude-filter.xml new file mode 100644 index 000..97cf1ef --- /dev/null +++ b/proxy/src/main/findbugs/exclude-filter.xml @@ -0,0 +1,21 @@ + + + + + + http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/trace/pom.xml -- diff --git a/trace/pom.xml b/trace/pom.xml index 8cd6969..0c34dfa 100644 --- a/trace/pom.xml +++ b/trace/pom.xml @@ -53,6 +53,19 @@ test + + + + + org.codehaus.mojo + findbugs-maven-plugin + + src/main/findbugs/exclude-filter.xml + + + + + thrift http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4b08b17/trace/src/main/findbugs/exclude-filter.xml -- diff --git a/trace/src/main/findbugs/exclude-filter.xml b/trace/src/main/findbugs/exclude-filter.xml new file mode 100644 index 000..408a32c ---
[2/3] git commit: ACCUMULO-2700 Fix system credentials checks and add a test
ACCUMULO-2700 Fix system credentials checks and add a test Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d2750908 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d2750908 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d2750908 Branch: refs/heads/1.6.0-SNAPSHOT Commit: d27509084ff45cef892c5735ee8fb559cd61dc0c Parents: e4b08b1 Author: Christopher Tubbs Authored: Mon Apr 21 15:14:05 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 15:27:53 2014 -0400 -- .../server/security/SecurityOperation.java | 8 +- .../server/security/SystemCredentials.java | 51 --- .../server/security/SystemCredentialsIT.java| 148 +++ 3 files changed, 177 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d2750908/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java -- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java index f8b1702..c2a7001 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java @@ -154,11 +154,11 @@ public class SecurityOperation { if (!credentials.getInstanceId().equals(HdfsZooInstance.getInstance().getInstanceID())) throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.INVALID_INSTANCEID); +AuthenticationToken token = AuthenticationTokenSerializer.deserialize(credentials.getTokenClassName(), credentials.getToken()); if (isSystemUser(credentials)) { - authenticateSystemUser(credentials); + authenticateSystemUserToken(credentials, token); } else { try { -AuthenticationToken token = AuthenticationTokenSerializer.deserialize(credentials.getTokenClassName(), credentials.getToken()); if (!authenticator.authenticateUser(credentials.getPrincipal(), token)) { throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.BAD_CREDENTIALS); } @@ -169,8 +169,8 @@ public class SecurityOperation { } } - private void authenticateSystemUser(TCredentials credentials) throws ThriftSecurityException { -if (SystemCredentials.get().getToken().equals(credentials.getToken())) + private void authenticateSystemUserToken(TCredentials credentials, AuthenticationToken token) throws ThriftSecurityException { +if (!SystemCredentials.get().getToken().equals(token)) throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.BAD_CREDENTIALS); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/d2750908/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java -- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java b/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java index 9b4931d..b5d7aba 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java @@ -43,55 +43,55 @@ import org.apache.hadoop.io.Writable; * @since 1.6.0 */ public final class SystemCredentials extends Credentials { - + private static final SecurityPermission SYSTEM_CREDENTIALS_PERMISSION = new SecurityPermission("systemCredentialsPermission"); - + private static SystemCredentials SYSTEM_CREDS = null; private static final String SYSTEM_PRINCIPAL = "!SYSTEM"; - private static final SystemToken SYSTEM_TOKEN = SystemToken.get(); - + private final TCredentials AS_THRIFT; - - private SystemCredentials() { -super(SYSTEM_PRINCIPAL, SYSTEM_TOKEN); -AS_THRIFT = super.toThrift(HdfsZooInstance.getInstance()); + + SystemCredentials(Instance instance) { +super(SYSTEM_PRINCIPAL, SystemToken.get(instance)); +AS_THRIFT = super.toThrift(instance); } - + public static SystemCredentials get() { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SYSTEM_CREDENTIALS_PERMISSION); } if (SYSTEM_CREDS == null) { - SYSTEM_CREDS = new SystemCredentials(); + SYSTEM_CREDS = new SystemCredentials(HdfsZooInstance.getInstance()); } return SYSTEM_CREDS; } - + @Override public TCredentials toThrift(Instance instance) { if (!AS_THRIFT.getInstanceId().equals(instance.getInstanceID()))
[3/3] git commit: ACCUMULO-2171 Include ShellServerIT in minimal/sunny testing
ACCUMULO-2171 Include ShellServerIT in minimal/sunny testing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6ea1ead4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6ea1ead4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6ea1ead4 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 6ea1ead4e97ca98fbca4dccf2eb70a58301a5c19 Parents: d275090 Author: Christopher Tubbs Authored: Mon Apr 21 15:24:37 2014 -0400 Committer: Christopher Tubbs Committed: Mon Apr 21 15:27:53 2014 -0400 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6ea1ead4/pom.xml -- diff --git a/pom.xml b/pom.xml index d321c55..133e08e 100644 --- a/pom.xml +++ b/pom.xml @@ -1061,7 +1061,7 @@ sunny false -ReadWriteIT,SimpleProxyIT,ExamplesIT +ReadWriteIT,SimpleProxyIT,ExamplesIT,ShellServerIT