[2/5] accumulo git commit: ACCUMULO-3812 Lots of cleanup to the proxy ITs
ACCUMULO-3812 Lots of cleanup to the proxy ITs
Single MAC and ProxyServer for the scope of the test.
Break down huge test cases into manageable units. Lets
us also reduce the overall timeout of the tests.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d81ef224
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d81ef224
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d81ef224
Branch: refs/heads/master
Commit: d81ef2241bf0aeb9f0216bdf4c8cfe65a3638b09
Parents: 4362929
Author: Josh Elser els...@apache.org
Authored: Wed May 13 16:24:32 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 13 16:24:32 2015 -0400
--
.../apache/accumulo/proxy/SimpleProxyBase.java | 1201 +++---
.../apache/accumulo/proxy/TBinaryProxyIT.java | 12 +-
.../apache/accumulo/proxy/TCompactProxyIT.java | 11 +-
.../accumulo/proxy/TJsonProtocolProxyIT.java| 12 +-
.../apache/accumulo/proxy/TTupleProxyIT.java| 12 +-
5 files changed, 746 insertions(+), 502 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d81ef224/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
--
diff --git a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
index e221081..eb7d661 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
@@ -19,6 +19,7 @@ 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.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -101,12 +102,16 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
+import org.apache.thrift.TApplicationException;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.server.TServer;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Iterators;
import com.google.common.net.HostAndPort;
@@ -115,26 +120,34 @@ import com.google.common.net.HostAndPort;
* Call every method on the proxy and try to verify that it works.
*/
public abstract class SimpleProxyBase extends SharedMiniClusterIT {
+ private static final Logger log =
LoggerFactory.getLogger(SimpleProxyBase.class);
@Override
protected int defaultTimeoutSeconds() {
-return 10 * 60;
+return 60;
}
private static final long ZOOKEEPER_PROPAGATION_TIME = 10 * 1000;
- private TServer proxyServer;
- private int proxyPort;
- private org.apache.accumulo.proxy.thrift.AccumuloProxy.Client client;
+ private static TServer proxyServer;
+ private static int proxyPort;
+ private static org.apache.accumulo.proxy.thrift.AccumuloProxy.Client client;
- private MapString,String properties = new HashMap();
- private ByteBuffer creds = null;
+ private static MapString,String properties = new HashMap();
+ private static ByteBuffer creds = null;
- private void waitForAccumulo(Connector c) throws Exception {
+ // Implementations can set this
+ static TProtocolFactory factory = null;
+
+ private static void waitForAccumulo(Connector c) throws Exception {
Iterators.size(c.createScanner(MetadataTable.NAME,
Authorizations.EMPTY).iterator());
}
- @Before
- public void setUpProxy() throws Exception {
+ /**
+ * Does the actual test setup, invoked by the concrete test class
+ */
+ public static void setUpProxy() throws Exception {
+assertNotNull(Implementations must initialize the TProtocolFactory,
factory);
+
Connector c = SharedMiniClusterIT.getConnector();
Instance inst = c.getInstance();
waitForAccumulo(c);
@@ -152,7 +165,6 @@ public abstract class SimpleProxyBase extends
SharedMiniClusterIT {
properties.put(clientConfigurationFile, emptyFile.toString());
proxyPort = PortUtils.getRandomFreePort();
-TProtocolFactory factory = getProtocol();
proxyServer = Proxy.createProxyServer(HostAndPort.fromParts(localhost,
proxyPort), factory, props).server;
while (!proxyServer.isServing())
UtilWaitThread.sleep(100);
@@ -160,292 +172,374 @@ public abstract class SimpleProxyBase extends
SharedMiniClusterIT {
creds = client.login(root, properties);
}
- @After
- public void tearDownProxy() throws Exception {
[1/5] accumulo git commit: ACCUMULO-3812 Lots of cleanup to the proxy ITs
Repository: accumulo
Updated Branches:
refs/heads/1.7 436292902 - d81ef2241
refs/heads/master 9cf9aaaca - eeca25db8
ACCUMULO-3812 Lots of cleanup to the proxy ITs
Single MAC and ProxyServer for the scope of the test.
Break down huge test cases into manageable units. Lets
us also reduce the overall timeout of the tests.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d81ef224
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d81ef224
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d81ef224
Branch: refs/heads/1.7
Commit: d81ef2241bf0aeb9f0216bdf4c8cfe65a3638b09
Parents: 4362929
Author: Josh Elser els...@apache.org
Authored: Wed May 13 16:24:32 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 13 16:24:32 2015 -0400
--
.../apache/accumulo/proxy/SimpleProxyBase.java | 1201 +++---
.../apache/accumulo/proxy/TBinaryProxyIT.java | 12 +-
.../apache/accumulo/proxy/TCompactProxyIT.java | 11 +-
.../accumulo/proxy/TJsonProtocolProxyIT.java| 12 +-
.../apache/accumulo/proxy/TTupleProxyIT.java| 12 +-
5 files changed, 746 insertions(+), 502 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d81ef224/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
--
diff --git a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
index e221081..eb7d661 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
@@ -19,6 +19,7 @@ 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.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -101,12 +102,16 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
+import org.apache.thrift.TApplicationException;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.server.TServer;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Iterators;
import com.google.common.net.HostAndPort;
@@ -115,26 +120,34 @@ import com.google.common.net.HostAndPort;
* Call every method on the proxy and try to verify that it works.
*/
public abstract class SimpleProxyBase extends SharedMiniClusterIT {
+ private static final Logger log =
LoggerFactory.getLogger(SimpleProxyBase.class);
@Override
protected int defaultTimeoutSeconds() {
-return 10 * 60;
+return 60;
}
private static final long ZOOKEEPER_PROPAGATION_TIME = 10 * 1000;
- private TServer proxyServer;
- private int proxyPort;
- private org.apache.accumulo.proxy.thrift.AccumuloProxy.Client client;
+ private static TServer proxyServer;
+ private static int proxyPort;
+ private static org.apache.accumulo.proxy.thrift.AccumuloProxy.Client client;
- private MapString,String properties = new HashMap();
- private ByteBuffer creds = null;
+ private static MapString,String properties = new HashMap();
+ private static ByteBuffer creds = null;
- private void waitForAccumulo(Connector c) throws Exception {
+ // Implementations can set this
+ static TProtocolFactory factory = null;
+
+ private static void waitForAccumulo(Connector c) throws Exception {
Iterators.size(c.createScanner(MetadataTable.NAME,
Authorizations.EMPTY).iterator());
}
- @Before
- public void setUpProxy() throws Exception {
+ /**
+ * Does the actual test setup, invoked by the concrete test class
+ */
+ public static void setUpProxy() throws Exception {
+assertNotNull(Implementations must initialize the TProtocolFactory,
factory);
+
Connector c = SharedMiniClusterIT.getConnector();
Instance inst = c.getInstance();
waitForAccumulo(c);
@@ -152,7 +165,6 @@ public abstract class SimpleProxyBase extends
SharedMiniClusterIT {
properties.put(clientConfigurationFile, emptyFile.toString());
proxyPort = PortUtils.getRandomFreePort();
-TProtocolFactory factory = getProtocol();
proxyServer = Proxy.createProxyServer(HostAndPort.fromParts(localhost,
proxyPort), factory, props).server;
while (!proxyServer.isServing())
UtilWaitThread.sleep(100);
@@ -160,292 +172,374 @@ public abstract class SimpleProxyBase extends
[3/5] accumulo git commit: Merge branch '1.7'
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eeca25db/test/src/test/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
index 9a12383,000..6359d1e
mode 100644,00..100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
@@@ -1,33 -1,0 +1,33 @@@
+/*
+ * 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.proxy;
+
+import org.apache.thrift.protocol.TBinaryProtocol;
- import org.apache.thrift.protocol.TProtocolFactory;
++import org.junit.BeforeClass;
+
+/**
+ *
+ */
+public class TBinaryProxyIT extends SimpleProxyBase {
+
- private static final TBinaryProtocol.Factory factory = new
TBinaryProtocol.Factory();
-
- @Override
- public TProtocolFactory getProtocol() {
- return factory;
++ @BeforeClass
++ public static void setProtocol() throws Exception {
++SimpleProxyBase.factory = new TBinaryProtocol.Factory();
++setUpProxy();
+ }
++
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eeca25db/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java
index 4d3e775,000..a92414a
mode 100644,00..100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java
@@@ -1,33 -1,0 +1,32 @@@
+/*
+ * 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.proxy;
+
+import org.apache.thrift.protocol.TCompactProtocol;
- import org.apache.thrift.protocol.TProtocolFactory;
++import org.junit.BeforeClass;
+
+/**
+ *
+ */
+public class TCompactProxyIT extends SimpleProxyBase {
+
- private static final TCompactProtocol.Factory factory = new
TCompactProtocol.Factory();
-
- @Override
- public TProtocolFactory getProtocol() {
- return factory;
++ @BeforeClass
++ public static void setProtocol() throws Exception {
++SimpleProxyBase.factory = new TCompactProtocol.Factory();
++setUpProxy();
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eeca25db/test/src/test/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
--
diff --cc
test/src/test/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
index fa04427,000..5fcbf53
mode 100644,00..100644
---
a/test/src/test/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
+++
b/test/src/test/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
@@@ -1,33 -1,0 +1,33 @@@
+/*
+ * 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
[4/5] accumulo git commit: Merge branch '1.7'
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eeca25db/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java -- diff --cc test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java index 03cb784,000..99ec4a1 mode 100644,00..100644 --- a/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java +++ b/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java @@@ -1,1620 -1,0 +1,1865 @@@ +/* + * 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.proxy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; ++import static org.junit.Assert.assertNotNull; +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.nio.file.Files; +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.Set; +import java.util.TreeMap; +import java.util.UUID; + +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Instance; +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.metadata.MetadataTable; +import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.core.util.ByteBufferUtil; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint; +import org.apache.accumulo.harness.SharedMiniClusterIT; +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; +import org.apache.accumulo.proxy.Proxy; +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.Column; +import org.apache.accumulo.proxy.thrift.ColumnUpdate; +import org.apache.accumulo.proxy.thrift.CompactionReason; +import org.apache.accumulo.proxy.thrift.CompactionStrategyConfig; +import org.apache.accumulo.proxy.thrift.CompactionType; +import org.apache.accumulo.proxy.thrift.Condition; +import org.apache.accumulo.proxy.thrift.ConditionalStatus; +import org.apache.accumulo.proxy.thrift.ConditionalUpdates; +import org.apache.accumulo.proxy.thrift.ConditionalWriterOptions; +import org.apache.accumulo.proxy.thrift.DiskUsage; +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.KeyValue; +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
[5/5] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eeca25db Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eeca25db Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eeca25db Branch: refs/heads/master Commit: eeca25db8ce264293fbeda9c4601e015d8c2baa5 Parents: 9cf9aaa d81ef22 Author: Josh Elser els...@apache.org Authored: Wed May 13 16:30:37 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Wed May 13 16:30:37 2015 -0400 -- .../accumulo/test/proxy/SimpleProxyBase.java| 1201 +++--- .../accumulo/test/proxy/TBinaryProxyIT.java | 12 +- .../accumulo/test/proxy/TCompactProxyIT.java| 11 +- .../test/proxy/TJsonProtocolProxyIT.java| 12 +- .../accumulo/test/proxy/TTupleProxyIT.java | 12 +- 5 files changed, 746 insertions(+), 502 deletions(-) --
[3/3] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11fb4429 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11fb4429 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/11fb4429 Branch: refs/heads/master Commit: 11fb44298230a5e8abb52e5cbdd4611e3020cb53 Parents: dbea798 2b96dee Author: Josh Elser els...@apache.org Authored: Wed May 13 22:53:45 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Wed May 13 22:53:45 2015 -0400 -- .../accumulo/cluster/standalone/StandaloneClusterControlTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/3] accumulo git commit: ACCUMULO-3815 Fix checkstyle nit
ACCUMULO-3815 Fix checkstyle nit Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b96deea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b96deea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2b96deea Branch: refs/heads/master Commit: 2b96deea46f63b0005b91274283dc45d858c1fc2 Parents: 25da2e3 Author: Josh Elser els...@apache.org Authored: Wed May 13 22:53:24 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Wed May 13 22:53:24 2015 -0400 -- .../accumulo/cluster/standalone/StandaloneClusterControlTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b96deea/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java -- diff --git a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java index b68a6e6..2849273 100644 --- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.cluster.standalone; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test;
[3/5] accumulo git commit: ACCUMULO-3815 Don't call getCanonicalPath on on accumulo home and confdir.
ACCUMULO-3815 Don't call getCanonicalPath on on accumulo home and confdir.
If we alter the passed-in paths, we might not grep the right thing.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25da2e3e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25da2e3e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25da2e3e
Branch: refs/heads/master
Commit: 25da2e3e960f2c2e983a1380d6d614824adca088
Parents: e622196
Author: Josh Elser els...@apache.org
Authored: Wed May 13 20:54:08 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 13 21:06:26 2015 -0400
--
.../standalone/StandaloneClusterControl.java| 8 ++---
.../StandaloneClusterControlTest.java | 38
2 files changed, 40 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/25da2e3e/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
index 029cd4c..c652b0b 100644
---
a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
@@ -64,12 +64,8 @@ public class StandaloneClusterControl implements
ClusterControl {
public StandaloneClusterControl(String user, String accumuloHome, String
accumuloConfDir) {
this.user = user;
this.options = new RemoteShellOptions();
-try {
- this.accumuloHome = new File(accumuloHome).getCanonicalPath();
- this.accumuloConfDir = new File(accumuloConfDir).getCanonicalPath();
-} catch (IOException e) {
- throw new RuntimeException(Failed to compute canonical path, e);
-}
+this.accumuloHome = accumuloHome;
+this.accumuloConfDir = accumuloConfDir;
File bin = new File(accumuloHome, bin);
this.startServerPath = new File(bin,
START_SERVER_SCRIPT).getAbsolutePath();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/25da2e3e/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java
--
diff --git
a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java
b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java
new file mode 100644
index 000..b68a6e6
--- /dev/null
+++
b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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.cluster.standalone;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class StandaloneClusterControlTest {
+
+ @Test
+ public void testPaths() {
+String accumuloHome = /usr/lib/accumulo, accumuloConfDir =
/etc/accumulo/conf;
+
+StandaloneClusterControl control = new
StandaloneClusterControl(accumulo, accumuloHome, accumuloConfDir);
+
+assertEquals(accumuloHome, control.accumuloHome);
+assertEquals(accumuloConfDir, control.accumuloConfDir);
+
+assertEquals(accumuloHome + /bin/accumulo, control.accumuloPath);
+assertEquals(accumuloHome + /bin/start-server.sh,
control.startServerPath);
+ }
+
+}
[1/5] accumulo git commit: ACCUMULO-3814 Include ACCUMULO_CONF_DIR when exec'ing commands
Repository: accumulo
Updated Branches:
refs/heads/1.7 d81ef2241 - 25da2e3e9
refs/heads/master eeca25db8 - dbea79825
ACCUMULO-3814 Include ACCUMULO_CONF_DIR when exec'ing commands
Makes sure things like SetGoalState will properly run.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e622196c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e622196c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e622196c
Branch: refs/heads/1.7
Commit: e622196c8eda64469252683c669b1730ea8efd32
Parents: d81ef22
Author: Josh Elser els...@apache.org
Authored: Wed May 13 20:32:18 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 13 20:32:18 2015 -0400
--
.../cluster/standalone/StandaloneClusterControl.java | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e622196c/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
index 89027e7..029cd4c 100644
---
a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
@@ -102,11 +102,13 @@ public class StandaloneClusterControl implements
ClusterControl {
public EntryInteger,String execWithStdout(Class? clz, String[] args)
throws IOException {
File confDir = getConfDir();
String master = getHosts(new File(confDir, masters)).get(0);
-String[] cmd = new String[2 + args.length];
-cmd[0] = accumuloPath;
-cmd[1] = clz.getName();
+String[] cmd = new String[3 + args.length];
+// Make sure we always set the right ACCUMULO_CONF_DIR
+cmd[0] = ACCUMULO_CONF_DIR + confDir;
+cmd[1] = accumuloPath;
+cmd[2] = clz.getName();
// Quote the arguments to prevent shell expansion
-for (int i = 0, j = 2; i args.length; i++, j++) {
+for (int i = 0, j = 3; i args.length; i++, j++) {
cmd[j] = ' + args[i] + ';
}
log.info(Running: '{}' on {}, StringUtils.join(cmd, ), master);
@@ -141,6 +143,7 @@ public class StandaloneClusterControl implements
ClusterControl {
File confDir = getConfDir();
String master = getHosts(new File(confDir, masters)).get(0);
String[] cmd = new String[] {SUDO_CMD, -u, user, ACCUMULO_CONF_DIR +
accumuloConfDir, accumuloPath, Admin.class.getName(), stopAll};
+// Directly invoke the RemoteShell
EntryInteger,String pair = exec(master, cmd);
if (0 != pair.getKey().intValue()) {
throw new IOException(stopAll did not finish successfully, retcode= +
pair.getKey() + , stdout= + pair.getValue());
[4/5] accumulo git commit: ACCUMULO-3815 Don't call getCanonicalPath on on accumulo home and confdir.
ACCUMULO-3815 Don't call getCanonicalPath on on accumulo home and confdir.
If we alter the passed-in paths, we might not grep the right thing.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25da2e3e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25da2e3e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25da2e3e
Branch: refs/heads/1.7
Commit: 25da2e3e960f2c2e983a1380d6d614824adca088
Parents: e622196
Author: Josh Elser els...@apache.org
Authored: Wed May 13 20:54:08 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 13 21:06:26 2015 -0400
--
.../standalone/StandaloneClusterControl.java| 8 ++---
.../StandaloneClusterControlTest.java | 38
2 files changed, 40 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/25da2e3e/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
index 029cd4c..c652b0b 100644
---
a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
@@ -64,12 +64,8 @@ public class StandaloneClusterControl implements
ClusterControl {
public StandaloneClusterControl(String user, String accumuloHome, String
accumuloConfDir) {
this.user = user;
this.options = new RemoteShellOptions();
-try {
- this.accumuloHome = new File(accumuloHome).getCanonicalPath();
- this.accumuloConfDir = new File(accumuloConfDir).getCanonicalPath();
-} catch (IOException e) {
- throw new RuntimeException(Failed to compute canonical path, e);
-}
+this.accumuloHome = accumuloHome;
+this.accumuloConfDir = accumuloConfDir;
File bin = new File(accumuloHome, bin);
this.startServerPath = new File(bin,
START_SERVER_SCRIPT).getAbsolutePath();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/25da2e3e/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java
--
diff --git
a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java
b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java
new file mode 100644
index 000..b68a6e6
--- /dev/null
+++
b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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.cluster.standalone;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class StandaloneClusterControlTest {
+
+ @Test
+ public void testPaths() {
+String accumuloHome = /usr/lib/accumulo, accumuloConfDir =
/etc/accumulo/conf;
+
+StandaloneClusterControl control = new
StandaloneClusterControl(accumulo, accumuloHome, accumuloConfDir);
+
+assertEquals(accumuloHome, control.accumuloHome);
+assertEquals(accumuloConfDir, control.accumuloConfDir);
+
+assertEquals(accumuloHome + /bin/accumulo, control.accumuloPath);
+assertEquals(accumuloHome + /bin/start-server.sh,
control.startServerPath);
+ }
+
+}
[5/5] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dbea7982 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dbea7982 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dbea7982 Branch: refs/heads/master Commit: dbea79825eb5b8882178cfaa09855b5704e890c4 Parents: eeca25d 25da2e3 Author: Josh Elser els...@apache.org Authored: Wed May 13 21:06:34 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Wed May 13 21:06:34 2015 -0400 -- .../standalone/StandaloneClusterControl.java| 19 +- .../StandaloneClusterControlTest.java | 38 2 files changed, 47 insertions(+), 10 deletions(-) --
[2/5] accumulo git commit: ACCUMULO-3814 Include ACCUMULO_CONF_DIR when exec'ing commands
ACCUMULO-3814 Include ACCUMULO_CONF_DIR when exec'ing commands
Makes sure things like SetGoalState will properly run.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e622196c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e622196c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e622196c
Branch: refs/heads/master
Commit: e622196c8eda64469252683c669b1730ea8efd32
Parents: d81ef22
Author: Josh Elser els...@apache.org
Authored: Wed May 13 20:32:18 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 13 20:32:18 2015 -0400
--
.../cluster/standalone/StandaloneClusterControl.java | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e622196c/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
index 89027e7..029cd4c 100644
---
a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
@@ -102,11 +102,13 @@ public class StandaloneClusterControl implements
ClusterControl {
public EntryInteger,String execWithStdout(Class? clz, String[] args)
throws IOException {
File confDir = getConfDir();
String master = getHosts(new File(confDir, masters)).get(0);
-String[] cmd = new String[2 + args.length];
-cmd[0] = accumuloPath;
-cmd[1] = clz.getName();
+String[] cmd = new String[3 + args.length];
+// Make sure we always set the right ACCUMULO_CONF_DIR
+cmd[0] = ACCUMULO_CONF_DIR + confDir;
+cmd[1] = accumuloPath;
+cmd[2] = clz.getName();
// Quote the arguments to prevent shell expansion
-for (int i = 0, j = 2; i args.length; i++, j++) {
+for (int i = 0, j = 3; i args.length; i++, j++) {
cmd[j] = ' + args[i] + ';
}
log.info(Running: '{}' on {}, StringUtils.join(cmd, ), master);
@@ -141,6 +143,7 @@ public class StandaloneClusterControl implements
ClusterControl {
File confDir = getConfDir();
String master = getHosts(new File(confDir, masters)).get(0);
String[] cmd = new String[] {SUDO_CMD, -u, user, ACCUMULO_CONF_DIR +
accumuloConfDir, accumuloPath, Admin.class.getName(), stopAll};
+// Directly invoke the RemoteShell
EntryInteger,String pair = exec(master, cmd);
if (0 != pair.getKey().intValue()) {
throw new IOException(stopAll did not finish successfully, retcode= +
pair.getKey() + , stdout= + pair.getValue());
[1/3] accumulo git commit: ACCUMULO-3816 Add in rpc.sasl.qop to kerberos chapter.
Repository: accumulo Updated Branches: refs/heads/1.7 2b96deea4 - b34744086 refs/heads/master 11fb44298 - 81302d398 ACCUMULO-3816 Add in rpc.sasl.qop to kerberos chapter. Also switch the ugly list into a beautiful table. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b3474408 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3474408 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b3474408 Branch: refs/heads/1.7 Commit: b3474408604171bbdbccfa76be116843a4005d95 Parents: 2b96dee Author: Josh Elser els...@apache.org Authored: Thu May 14 00:58:41 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Thu May 14 00:58:41 2015 -0400 -- docs/src/main/asciidoc/chapters/kerberos.txt | 83 +++ 1 file changed, 53 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3474408/docs/src/main/asciidoc/chapters/kerberos.txt -- diff --git a/docs/src/main/asciidoc/chapters/kerberos.txt b/docs/src/main/asciidoc/chapters/kerberos.txt index 95fd5f6..ca482b2 100644 --- a/docs/src/main/asciidoc/chapters/kerberos.txt +++ b/docs/src/main/asciidoc/chapters/kerberos.txt @@ -146,36 +146,59 @@ all Accumulo servers must share the same instance and realm principal components A number of properties need to be changed to account to properly configure servers in +accumulo-site.xml+. -* *general.kerberos.keytab*=_/etc/security/keytabs/accumulo.service.keytab_ -** The path to the keytab for Accumulo on local filesystem. -** Change the value to the actual path on your system. -* *general.kerberos.principal*=_accumulo/_HOST@REALM_ -** The Kerberos principal for Accumulo, needs to match the keytab. -** _HOST can be used instead of the actual hostname in the principal and will be -automatically expanded to the current FQDN which reduces the configuration file burden. -* *instance.rpc.sasl.enabled*=_true_ -** Enables SASL for the Thrift Servers (supports GSSAPI) -* *instance.security.authenticator*=_org.apache.accumulo.server.security.handler.KerberosAuthenticator_ -** Configures Accumulo to use the Kerberos principal as the Accumulo username/principal -* *instance.security.authorizor*=_org.apache.accumulo.server.security.handler.KerberosAuthorizor_ -** Configures Accumulo to use the Kerberos principal for authorization purposes -* *instance.security.permissionHandler*=_org.apache.accumulo.server.security.handler.KerberosPermissionHandler_ -** Configures Accumulo to use the Kerberos principal for permission purposes -* *trace.token.type*=_org.apache.accumulo.core.client.security.tokens.KerberosToken_ -** Configures the Accumulo Tracer to use the KerberosToken for authentication when -serializing traces to the trace table. -* *trace.user*=_accumulo/_HOST@REALM_ -** The tracer process needs valid credentials to serialize traces to Accumulo. -** While the other server processes are creating a SystemToken from the provided keytab and principal, we can -still use a normal KerberosToken and the same keytab/principal to serialize traces. Like -non-Kerberized instances, the table must be created and permissions granted to the trace.user. -** The same +_HOST+ replacement is performed on this value, substituted the FQDN for +_HOST+. -* *general.delegation.token.lifetime*=_7d_ -** The length of time that the server-side secret used to create delegation tokens is valid. - After a server-side secret expires, a delegation token created with that secret is no longer valid. -* *general.delegation.token.update.interval*=_1d_ -** The frequency in which new server-side secrets should be generated to create delegation - tokens for clients. Generating new secrets reduces the likelihood of cryptographic attacks. +[options=header] +|= +|Key | Default Value | Description +|general.kerberos.keytab |/etc/security/keytabs/accumulo.service.keytab | +The path to the keytab for Accumulo on local filesystem. Change the value to the actual path on your system. + +|general.kerberos.principal |accumulo/_HOST@REALM | +The Kerberos principal for Accumulo, needs to match the keytab. _HOST can be used instead of the actual hostname in the principal and will be automatically expanded to the current FQDN which reduces the configuration file burden. + +|instance.rpc.sasl.enabled |true | +Enables SASL for the Thrift Servers (supports GSSAPI) + +|rpc.sasl.qop|auth | +One of auth, auth-int, or auth-conf. These map to the SASL defined properties for +quality of protection. auth is authentication only. auth-int is authentication and data +integrity.
[2/3] accumulo git commit: ACCUMULO-3816 Add in rpc.sasl.qop to kerberos chapter.
ACCUMULO-3816 Add in rpc.sasl.qop to kerberos chapter. Also switch the ugly list into a beautiful table. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b3474408 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3474408 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b3474408 Branch: refs/heads/master Commit: b3474408604171bbdbccfa76be116843a4005d95 Parents: 2b96dee Author: Josh Elser els...@apache.org Authored: Thu May 14 00:58:41 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Thu May 14 00:58:41 2015 -0400 -- docs/src/main/asciidoc/chapters/kerberos.txt | 83 +++ 1 file changed, 53 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3474408/docs/src/main/asciidoc/chapters/kerberos.txt -- diff --git a/docs/src/main/asciidoc/chapters/kerberos.txt b/docs/src/main/asciidoc/chapters/kerberos.txt index 95fd5f6..ca482b2 100644 --- a/docs/src/main/asciidoc/chapters/kerberos.txt +++ b/docs/src/main/asciidoc/chapters/kerberos.txt @@ -146,36 +146,59 @@ all Accumulo servers must share the same instance and realm principal components A number of properties need to be changed to account to properly configure servers in +accumulo-site.xml+. -* *general.kerberos.keytab*=_/etc/security/keytabs/accumulo.service.keytab_ -** The path to the keytab for Accumulo on local filesystem. -** Change the value to the actual path on your system. -* *general.kerberos.principal*=_accumulo/_HOST@REALM_ -** The Kerberos principal for Accumulo, needs to match the keytab. -** _HOST can be used instead of the actual hostname in the principal and will be -automatically expanded to the current FQDN which reduces the configuration file burden. -* *instance.rpc.sasl.enabled*=_true_ -** Enables SASL for the Thrift Servers (supports GSSAPI) -* *instance.security.authenticator*=_org.apache.accumulo.server.security.handler.KerberosAuthenticator_ -** Configures Accumulo to use the Kerberos principal as the Accumulo username/principal -* *instance.security.authorizor*=_org.apache.accumulo.server.security.handler.KerberosAuthorizor_ -** Configures Accumulo to use the Kerberos principal for authorization purposes -* *instance.security.permissionHandler*=_org.apache.accumulo.server.security.handler.KerberosPermissionHandler_ -** Configures Accumulo to use the Kerberos principal for permission purposes -* *trace.token.type*=_org.apache.accumulo.core.client.security.tokens.KerberosToken_ -** Configures the Accumulo Tracer to use the KerberosToken for authentication when -serializing traces to the trace table. -* *trace.user*=_accumulo/_HOST@REALM_ -** The tracer process needs valid credentials to serialize traces to Accumulo. -** While the other server processes are creating a SystemToken from the provided keytab and principal, we can -still use a normal KerberosToken and the same keytab/principal to serialize traces. Like -non-Kerberized instances, the table must be created and permissions granted to the trace.user. -** The same +_HOST+ replacement is performed on this value, substituted the FQDN for +_HOST+. -* *general.delegation.token.lifetime*=_7d_ -** The length of time that the server-side secret used to create delegation tokens is valid. - After a server-side secret expires, a delegation token created with that secret is no longer valid. -* *general.delegation.token.update.interval*=_1d_ -** The frequency in which new server-side secrets should be generated to create delegation - tokens for clients. Generating new secrets reduces the likelihood of cryptographic attacks. +[options=header] +|= +|Key | Default Value | Description +|general.kerberos.keytab |/etc/security/keytabs/accumulo.service.keytab | +The path to the keytab for Accumulo on local filesystem. Change the value to the actual path on your system. + +|general.kerberos.principal |accumulo/_HOST@REALM | +The Kerberos principal for Accumulo, needs to match the keytab. _HOST can be used instead of the actual hostname in the principal and will be automatically expanded to the current FQDN which reduces the configuration file burden. + +|instance.rpc.sasl.enabled |true | +Enables SASL for the Thrift Servers (supports GSSAPI) + +|rpc.sasl.qop|auth | +One of auth, auth-int, or auth-conf. These map to the SASL defined properties for +quality of protection. auth is authentication only. auth-int is authentication and data +integrity. auth-conf is authentication, data integrity and confidentiality. + + +|instance.security.authenticator |
[3/3] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81302d39 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81302d39 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81302d39 Branch: refs/heads/master Commit: 81302d398f4f6e8c5b6b7581638a65efe5a22c9a Parents: 11fb442 b347440 Author: Josh Elser els...@apache.org Authored: Thu May 14 01:30:04 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Thu May 14 01:30:04 2015 -0400 -- docs/src/main/asciidoc/chapters/kerberos.txt | 83 +++ 1 file changed, 53 insertions(+), 30 deletions(-) --
