[accumulo] branch master updated (b820368 -> 9619125)

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from b820368  ACCUMULO-4824 Fix Jersey dependency conflict causing ITs to 
fail (#391)
 new eb8ea99  ACCUMULO-4639 Relocate NullTserver test class
 new 9619125  Merge branch '1.8'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/accumulo/test/functional/ZombieTServer.java|  2 +-
 .../test/performance/{thrift => }/NullTserver.java| 15 ++-
 2 files changed, 7 insertions(+), 10 deletions(-)
 rename test/src/main/java/org/apache/accumulo/test/performance/{thrift => 
}/NullTserver.java (96%)

-- 
To stop receiving notification emails like this one, please contact
ctubb...@apache.org.

[accumulo] 01/01: Merge branch '1.8'

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 9619125b747e82a1e5a20450c62395d7f5e0c153
Merge: b820368 eb8ea99
Author: Christopher Tubbs 
AuthorDate: Thu Feb 22 20:01:22 2018 -0500

Merge branch '1.8'

 .../apache/accumulo/test/functional/ZombieTServer.java|  2 +-
 .../test/performance/{thrift => }/NullTserver.java| 15 ++-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
index af8afd4,c2b6a27..8784fd4
--- a/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
@@@ -28,13 -28,10 +28,12 @@@ import java.util.concurrent.TimeUnit
  
  import org.apache.accumulo.core.cli.Help;
  import org.apache.accumulo.core.client.ClientConfiguration;
 +import org.apache.accumulo.core.client.Instance;
  import org.apache.accumulo.core.client.ZooKeeperInstance;
 +import org.apache.accumulo.core.client.impl.Table;
  import org.apache.accumulo.core.client.impl.Tables;
--import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
  import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
 +import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
  import org.apache.accumulo.core.conf.DefaultConfiguration;
  import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.data.Range;
@@@ -49,7 -46,7 +48,6 @@@ import org.apache.accumulo.core.data.th
  import org.apache.accumulo.core.data.thrift.TColumn;
  import org.apache.accumulo.core.data.thrift.TConditionalMutation;
  import org.apache.accumulo.core.data.thrift.TConditionalSession;
--import org.apache.accumulo.core.data.thrift.TConstraintViolationSummary;
  import org.apache.accumulo.core.data.thrift.TKeyExtent;
  import org.apache.accumulo.core.data.thrift.TMutation;
  import org.apache.accumulo.core.data.thrift.TRange;
@@@ -242,29 -235,6 +239,29 @@@ public class NullTserver 
  
  @Override
  public void removeLogs(TInfo tinfo, TCredentials credentials, 
List filenames) throws TException {}
 +
 +@Override
- public TSummaries startGetSummaries(TInfo tinfo, TCredentials 
credentials, TSummaryRequest request)
- throws ThriftSecurityException, ThriftTableOperationException, 
NoSuchScanIDException, TException {
++public TSummaries startGetSummaries(TInfo tinfo, TCredentials 
credentials, TSummaryRequest request) throws ThriftSecurityException,
++ThriftTableOperationException, NoSuchScanIDException, TException {
 +  return null;
 +}
 +
 +@Override
 +public TSummaries startGetSummariesForPartition(TInfo tinfo, TCredentials 
credentials, TSummaryRequest request, int modulus, int remainder)
 +throws ThriftSecurityException, NoSuchScanIDException, TException {
 +  return null;
 +}
 +
 +@Override
 +public TSummaries startGetSummariesFromFiles(TInfo tinfo, TCredentials 
credentials, TSummaryRequest request, Map files)
 +throws ThriftSecurityException, NoSuchScanIDException, TException {
 +  return null;
 +}
 +
 +@Override
 +public TSummaries contiuneGetSummaries(TInfo tinfo, long sessionId) 
throws NoSuchScanIDException, TException {
 +  return null;
 +}
}
  
static class Opts extends Help {
@@@ -284,14 -254,13 +281,14 @@@
  
  // modify metadata
  ZooKeeperInstance zki = new 
ZooKeeperInstance(ClientConfiguration.create().withInstance(opts.iname).withZkHosts(opts.keepers));
 -AccumuloServerContext context = new AccumuloServerContext(new 
ServerConfigurationFactory(zki));
 +Instance inst = HdfsZooInstance.getInstance();
 +AccumuloServerContext context = new AccumuloServerContext(inst, new 
ServerConfigurationFactory(zki));
  
  TransactionWatcher watcher = new TransactionWatcher();
 -ThriftClientHandler tch = new ThriftClientHandler(new 
AccumuloServerContext(new 
ServerConfigurationFactory(HdfsZooInstance.getInstance())), watcher);
 -Processor processor = new Processor(tch);
 +ThriftClientHandler tch = new ThriftClientHandler(new 
AccumuloServerContext(inst, new ServerConfigurationFactory(inst)), watcher);
 +Processor processor = new Processor<>(tch);
- TServerUtils.startTServer(context.getConfiguration(), 
ThriftServerType.CUSTOM_HS_HA, processor, "NullTServer", "null tserver", 2, 1, 
1000, 10 * 1024 * 1024,
- null, null, -1, HostAndPort.fromParts("0.0.0.0", opts.port));
+ TServerUtils.startTServer(context.getConfiguration(), 
ThriftServerType.CUSTOM_HS_HA, processor, "NullTServer", "null tserver", 2, 1, 
1000,
+ 10 * 1024 * 1024, null, null, -1, HostAndPort.fromParts("0.0.0.0", 
opts.port));
  
  HostAndPort addr = 

[accumulo] branch 1.8 updated: ACCUMULO-4639 Relocate NullTserver test class

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.8 by this push:
 new eb8ea99  ACCUMULO-4639 Relocate NullTserver test class
eb8ea99 is described below

commit eb8ea99f5e37cdcf7e7c9a823ac3a7f8ac05c596
Author: Christopher Tubbs 
AuthorDate: Thu Feb 22 19:16:30 2018 -0500

ACCUMULO-4639 Relocate NullTserver test class

* Relocate NullTserver test class outside of a directory named "thrift"
so that it won't match our build tool excludes targeting thrift
generated files, such as being excluded from formatting during the
build.
---
 .../main/java/org/apache/accumulo/test/functional/ZombieTServer.java| 2 +-
 .../org/apache/accumulo/test/performance/{thrift => }/NullTserver.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java 
b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index bc34b67..65400b8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ZombieTServer {
 
-  public static class ThriftClientHandler extends 
org.apache.accumulo.test.performance.thrift.NullTserver.ThriftClientHandler {
+  public static class ThriftClientHandler extends 
org.apache.accumulo.test.performance.NullTserver.ThriftClientHandler {
 
 int statusCount = 0;
 
diff --git 
a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
 b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
similarity index 99%
rename from 
test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
rename to 
test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
index c9da60b..c2b6a27 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.test.performance.thrift;
+package org.apache.accumulo.test.performance;
 
 import static 
org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly;
 

-- 
To stop receiving notification emails like this one, please contact
ctubb...@apache.org.

[accumulo] branch master updated: ACCUMULO-4824 Fix Jersey dependency conflict causing ITs to fail (#391)

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new b820368  ACCUMULO-4824 Fix Jersey dependency conflict causing ITs to 
fail (#391)
b820368 is described below

commit b820368428cc03f84ab3cd083385d8fa2be7cd69
Author: Mike Walch 
AuthorDate: Thu Feb 22 18:02:42 2018 -0500

ACCUMULO-4824 Fix Jersey dependency conflict causing ITs to fail (#391)

* Jersey 1.x jars were excluded in test module causing ITs to fail
* Moved WebViewsIT to monitor which requires Jersey 2.x
* Removed 1.x exclusions from test module
---
 server/monitor/pom.xml | 34 +++
 .../org/apache/accumulo}/monitor/WebViewsIT.java   |  7 +--
 .../apache/accumulo/monitor/util/MonitorTests.java | 22 
 test/pom.xml   | 66 --
 4 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 70c69ee..2a6034c 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -120,6 +120,10 @@
 
 
   org.glassfish.jersey.ext
+  jersey-bean-validation
+
+
+  org.glassfish.jersey.ext
   jersey-mvc-freemarker
 
 
@@ -136,6 +140,36 @@
   test
 
 
+  org.easymock
+  easymock
+  test
+
+
+  org.glassfish.jersey.core
+  jersey-client
+  test
+
+
+  org.glassfish.jersey.test-framework
+  jersey-test-framework-core
+  test
+
+
+  org.glassfish.jersey.test-framework.providers
+  jersey-test-framework-provider-grizzly2
+  test
+
+
+  org.powermock
+  powermock-api-easymock
+  test
+
+
+  org.powermock
+  powermock-module-junit4
+  test
+
+
   org.slf4j
   slf4j-log4j12
   test
diff --git 
a/test/src/main/java/org/apache/accumulo/test/monitor/WebViewsIT.java 
b/server/monitor/src/test/java/org/apache/accumulo/monitor/WebViewsIT.java
similarity index 97%
rename from test/src/main/java/org/apache/accumulo/test/monitor/WebViewsIT.java
rename to 
server/monitor/src/test/java/org/apache/accumulo/monitor/WebViewsIT.java
index 8e9169d..d92d4f8 100644
--- a/test/src/main/java/org/apache/accumulo/test/monitor/WebViewsIT.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/WebViewsIT.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.test.monitor;
+package org.apache.accumulo.monitor;
 
 import static org.easymock.EasyMock.expect;
 
@@ -35,10 +35,9 @@ import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.impl.Table;
 import org.apache.accumulo.core.client.impl.Tables;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
-import org.apache.accumulo.monitor.Monitor;
+import org.apache.accumulo.monitor.util.MonitorTests;
 import org.apache.accumulo.monitor.view.WebViews;
 import org.apache.accumulo.server.AccumuloServerContext;
-import org.apache.accumulo.test.categories.SunnyDayTests;
 import org.easymock.EasyMock;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.server.ResourceConfig;
@@ -55,7 +54,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 /**
  * Basic tests for parameter validation constraints
  */
-@Category(SunnyDayTests.class)
+@Category(MonitorTests.class)
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Monitor.class, Tables.class})
 public class WebViewsIT extends JerseyTest {
diff --git 
a/server/monitor/src/test/java/org/apache/accumulo/monitor/util/MonitorTests.java
 
b/server/monitor/src/test/java/org/apache/accumulo/monitor/util/MonitorTests.java
new file mode 100644
index 000..0bf3f29
--- /dev/null
+++ 
b/server/monitor/src/test/java/org/apache/accumulo/monitor/util/MonitorTests.java
@@ -0,0 +1,22 @@
+/*
+ * 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.monitor.util;
+
+/**
+ * Special category for 

[accumulo-examples] branch master updated: ACCUMULO-4804 Fix ChunkInput ITs

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-examples.git


The following commit(s) were added to refs/heads/master by this push:
 new 5b37ccf  ACCUMULO-4804 Fix ChunkInput ITs
5b37ccf is described below

commit 5b37ccf0929e254b275ea80730f0f1db8ec6c60f
Author: Mike Miller 
AuthorDate: Thu Feb 22 13:51:03 2018 -0500

ACCUMULO-4804 Fix ChunkInput ITs
---
 .../org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java  | 6 ++
 .../org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java  | 7 +++
 2 files changed, 13 insertions(+)

diff --git 
a/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java 
b/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java
index aa56c1b..5ed7d5d 100644
--- 
a/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java
+++ 
b/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputFormatIT.java
@@ -32,12 +32,14 @@ import java.util.Map.Entry;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.harness.AccumuloClusterHarness;
+import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.mapreduce.Job;
@@ -53,6 +55,10 @@ import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 
 public class ChunkInputFormatIT extends AccumuloClusterHarness {
+  @Override
+  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
+cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, "false");
+  }
 
   // track errors in the map reduce job; jobs insert a dummy error for the map 
and cleanup tasks (to ensure test correctness),
   // so error tests should check to see if there is at least one error (could 
be more depending on the test) rather than zero
diff --git 
a/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java 
b/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java
index 69b8f48..e45762a 100644
--- 
a/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java
+++ 
b/src/test/java/org/apache/accumulo/examples/filedata/ChunkInputStreamIT.java
@@ -33,6 +33,7 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyValue;
 import org.apache.accumulo.core.data.Mutation;
@@ -41,11 +42,17 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.util.PeekingIterator;
 import org.apache.accumulo.harness.AccumuloClusterHarness;
+import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.junit.Before;
 import org.junit.Test;
 
 public class ChunkInputStreamIT extends AccumuloClusterHarness {
+  @Override
+  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
+cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, "false");
+  }
 
   private static final Authorizations AUTHS = new Authorizations("A", "B", 
"C", "D");
 

-- 
To stop receiving notification emails like this one, please contact
mmil...@apache.org.