From 40b9a9567486bd4ddd73bf2c8ae05d82cf510e79 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Thu, 5 Nov 2015 18:31:09 -0500 Subject: [PATCH] Fix patches for 1.6.4 --- accumulo.spec | 10 +++- commons-configuration.patch | 8 +-- commons-math.patch | 2 +- default-conf.patch | 53 +++++++++-------- disabled-tests.patch | 18 +++--- jetty9.patch | 115 ++++++++++++++++++++---------------- native-code.patch | 28 ++++----- 7 files changed, 126 insertions(+), 108 deletions(-) diff --git a/accumulo.spec b/accumulo.spec index a1af07f..63daf1f 100644 --- a/accumulo.spec +++ b/accumulo.spec @@ -12,7 +12,7 @@ Name: %{proj} Version: 1.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software platform for processing vast amounts of data License: ASL 2.0 Group: Development/Libraries @@ -327,6 +327,8 @@ This package contains the API documentation for %{longproj}. %pom_disable_module docs %pom_disable_module assemble %if !%{include_monitor} +# mini has dependency on monitor +%pom_disable_module minicluster %pom_disable_module server/monitor %endif @@ -340,7 +342,9 @@ This package contains the API documentation for %{longproj}. %pom_remove_plugin :findbugs-maven-plugin %pom_remove_plugin :maven-project-info-reports-plugin +%if %{include_monitor} %mvn_package ":%{name}-minicluster" __noinstall +%endif %mvn_package ":%{name}-{project,core,fate,trace,start}" core %mvn_package ":%{name}-examples-simple" examples %mvn_package ":%{name}-gc" gc @@ -441,7 +445,6 @@ install -p -m 755 %{SOURCE6} %{buildroot}%{_javaconfdir}/%{name}.conf %files %files core -f .mfiles-core -%doc CHANGES %doc LICENSE %doc README %doc NOTICE @@ -569,6 +572,9 @@ getent passwd %{name} >/dev/null || /usr/sbin/useradd --comment "%{longproj}" -- %endif %changelog +* Thu Nov 05 2015 Christopher Tubbs - 1.6.4-2 +- Fix patches for 1.6.4 + * Thu Nov 05 2015 Christopher Tubbs - 1.6.4-1 - Update to 1.6.4 diff --git a/commons-configuration.patch b/commons-configuration.patch index 02903df..84707fc 100644 --- a/commons-configuration.patch +++ b/commons-configuration.patch @@ -1,8 +1,8 @@ diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java -index ce482f5..9730c3e 100644 +index e512936..b78e958 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java -@@ -653,7 +653,8 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster { +@@ -713,7 +713,8 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster { @Override public ClientConfiguration getClientConfig() { @@ -13,10 +13,10 @@ index ce482f5..9730c3e 100644 } diff --git a/pom.xml b/pom.xml -index b314ff0..436db08 100644 +index 3d0d903..8c3d880 100644 --- a/pom.xml +++ b/pom.xml -@@ -171,7 +171,7 @@ +@@ -179,7 +179,7 @@ commons-configuration commons-configuration diff --git a/commons-math.patch b/commons-math.patch index 3c9ce75..59baacd 100644 --- a/commons-math.patch +++ b/commons-math.patch @@ -1,5 +1,5 @@ diff --git a/core/src/main/java/org/apache/accumulo/core/util/Stat.java b/core/src/main/java/org/apache/accumulo/core/util/Stat.java -index d2d560e..8bdeb63 100644 +index d2d560e..2fdfd62 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/Stat.java +++ b/core/src/main/java/org/apache/accumulo/core/util/Stat.java @@ -16,12 +16,12 @@ diff --git a/default-conf.patch b/default-conf.patch index 1a8c172..1111d0f 100644 --- a/default-conf.patch +++ b/default-conf.patch @@ -1,5 +1,5 @@ diff --git a/assemble/conf/templates/accumulo-metrics.xml b/assemble/conf/templates/accumulo-metrics.xml -index 60f9f8d..f30b098 100644 +index ec54994..04edb84 100644 --- a/assemble/conf/templates/accumulo-metrics.xml +++ b/assemble/conf/templates/accumulo-metrics.xml @@ -23,7 +23,8 @@ @@ -13,23 +13,19 @@ index 60f9f8d..f30b098 100644 +- instance.zookeeper.host +- localhost:2181 +- comma separated list of zookeeper servers + instance.volumes + file:///tmp/accumulo + comma separated list of dfs URIs -+ -+ -+ - instance.zookeeper.host - localhost:2181 - comma separated list of zookeeper servers -@@ -28,15 +28,6 @@ @@ -39,13 +35,13 @@ index 052ed7e..7d90774 100644 - filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 - write ahead logs into DFS. It is possible to specify a comma-separated list of directories. - -- -- -- - instance.secret - DEFAULT - A secret unique to a given instance that all servers must know in order to communicate with one another. -@@ -89,44 +80,13 @@ ++ instance.zookeeper.host ++ localhost:2181 ++ comma separated list of zookeeper servers + + + +@@ -89,49 +86,13 @@ ${mvnProjBaseDir} general.classpaths @@ -58,34 +54,39 @@ index 052ed7e..7d90774 100644 - $ACCUMULO_HOME/lib/accumulo-fate.jar, - $ACCUMULO_HOME/lib/accumulo-proxy.jar, - $ACCUMULO_HOME/lib/[^.].*.jar, -- -- - - $ZOOKEEPER_HOME/zookeeper[^.].*.jar, -- -- - - $HADOOP_CONF_DIR, -- -- - - $HADOOP_PREFIX/share/hadoop/common/[^.].*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, - $HADOOP_PREFIX/share/hadoop/hdfs/[^.].*.jar, - $HADOOP_PREFIX/share/hadoop/mapreduce/[^.].*.jar, - $HADOOP_PREFIX/share/hadoop/yarn/[^.].*.jar, +- $HADOOP_PREFIX/share/hadoop/yarn/lib/jersey.*.jar, +- +- - /usr/lib/hadoop/[^.].*.jar, - /usr/lib/hadoop/lib/[^.].*.jar, - /usr/lib/hadoop-hdfs/[^.].*.jar, - /usr/lib/hadoop-mapreduce/[^.].*.jar, - /usr/lib/hadoop-yarn/[^.].*.jar, -- -- +- /usr/lib/hadoop-yarn/lib/jersey.*.jar, +- +- +- /usr/hdp/current/hadoop-client/[^.].*.jar, +- /usr/hdp/current/hadoop-client/lib/(?!slf4j)[^.].*.jar, +- /usr/hdp/current/hadoop-hdfs-client/[^.].*.jar, +- /usr/hdp/current/hadoop-mapreduce-client/[^.].*.jar, +- /usr/hdp/current/hadoop-yarn-client/[^.].*.jar, +- /usr/hdp/current/hadoop-yarn-client/lib/jersey.*.jar, +- /usr/hdp/current/hive-client/lib/hive-accumulo-handler.jar +- - - $HADOOP_PREFIX/[^.].*.jar, - $HADOOP_PREFIX/lib/(?!slf4j)[^.].*.jar, - -- - + /etc/accumulo/lib Classpaths that accumulo checks for updates and class files. diff --git a/disabled-tests.patch b/disabled-tests.patch index 7496a04..fe25c8f 100644 --- a/disabled-tests.patch +++ b/disabled-tests.patch @@ -1,8 +1,8 @@ diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java -index d4c0aea..7686a34 100644 +index 0453beb..84e4ad9 100644 --- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java +++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java -@@ -52,6 +52,7 @@ import org.junit.After; +@@ -53,6 +53,7 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -10,7 +10,7 @@ index d4c0aea..7686a34 100644 import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; -@@ -59,6 +60,7 @@ import org.powermock.modules.junit4.PowerMockRunner; +@@ -60,6 +61,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) @PrepareForTest({Shell.class, ZooUtil.class, ConfigSanityCheck.class}) @@ -18,11 +18,11 @@ index d4c0aea..7686a34 100644 public class ShellSetInstanceTest { public static class TestOutputStream extends OutputStream { StringBuilder sb = new StringBuilder(); -diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java -index 4d379cc..3ebdef9 100644 ---- a/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java -+++ b/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java -@@ -34,6 +34,7 @@ import org.apache.accumulo.core.util.shell.commands.HistoryCommand; +diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/commands/HistoryCommandTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/commands/HistoryCommandTest.java +index 9b98e4a..696a090 100644 +--- a/core/src/test/java/org/apache/accumulo/core/util/shell/commands/HistoryCommandTest.java ++++ b/core/src/test/java/org/apache/accumulo/core/util/shell/commands/HistoryCommandTest.java +@@ -33,6 +33,7 @@ import org.apache.accumulo.core.util.shell.Shell; import org.apache.commons.cli.CommandLine; import org.junit.Assume; import org.junit.Before; @@ -30,7 +30,7 @@ index 4d379cc..3ebdef9 100644 import org.junit.Test; public class HistoryCommandTest { -@@ -77,6 +78,7 @@ public class HistoryCommandTest { +@@ -76,6 +77,7 @@ public class HistoryCommandTest { } @Test diff --git a/jetty9.patch b/jetty9.patch index a052cc0..e053a73 100644 --- a/jetty9.patch +++ b/jetty9.patch @@ -1,5 +1,5 @@ diff --git a/assemble/pom.xml b/assemble/pom.xml -index 6c88765..c0cbe22 100644 +index db26388..49d127f 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -126,10 +126,6 @@ @@ -14,7 +14,7 @@ index 6c88765..c0cbe22 100644 diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml -index a8f7716..a52980b 100644 +index 96e1fbe..a0fd410 100644 --- a/assemble/src/main/assemblies/component.xml +++ b/assemble/src/main/assemblies/component.xml @@ -35,7 +35,6 @@ @@ -26,19 +26,19 @@ index a8f7716..a52980b 100644 org.eclipse.jetty:jetty-io org.eclipse.jetty:jetty-security diff --git a/pom.xml b/pom.xml -index b0f9298..901c65d 100644 +index bd206e3..3d0d903 100644 --- a/pom.xml +++ b/pom.xml -@@ -123,7 +123,7 @@ - +@@ -128,7 +128,7 @@ 2.2.0 3.1 + 1.6 - 8.1.15.v20140411 + 9.1.5.v20140505 3.0.4 -@@ -199,7 +199,7 @@ +@@ -204,7 +204,7 @@ javax.servlet javax.servlet-api @@ -47,7 +47,7 @@ index b0f9298..901c65d 100644 javax.ws.rs -@@ -416,11 +416,6 @@ +@@ -421,11 +421,6 @@ org.eclipse.jetty @@ -59,20 +59,21 @@ index b0f9298..901c65d 100644 jetty-http ${jetty.version} -@@ -450,11 +445,6 @@ +@@ -454,12 +449,6 @@ + jetty-util ${jetty.version} - +- +- - org.mortbay.jetty - jetty - 6.1.26 - -- + org.powermock powermock-api-easymock - ${powermock.version} diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml -index fcccc89..23b6d03 100644 +index f3dcd4a..e8146be 100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@ -81,10 +81,6 @@ @@ -96,15 +97,13 @@ index fcccc89..23b6d03 100644 diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java -index 82cd436..08cd9df 100644 +index 41890e8..dea263a 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java -@@ -20,11 +20,11 @@ import javax.servlet.http.HttpServlet; - - import org.apache.accumulo.core.conf.AccumuloConfiguration; - import org.apache.accumulo.core.conf.Property; --import org.apache.commons.lang.StringUtils; -+import org.apache.hadoop.util.StringUtils; +@@ -23,10 +23,10 @@ import org.apache.accumulo.core.conf.Property; + import org.apache.commons.lang.StringUtils; + import org.eclipse.jetty.security.ConstraintMapping; + import org.eclipse.jetty.security.ConstraintSecurityHandler; +import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.nio.SelectChannelConnector; @@ -112,9 +111,9 @@ index 82cd436..08cd9df 100644 import org.eclipse.jetty.server.session.SessionHandler; -import org.eclipse.jetty.server.ssl.SslSelectChannelConnector; import org.eclipse.jetty.servlet.ServletContextHandler; + import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.ssl.SslContextFactory; - -@@ -32,7 +32,7 @@ public class EmbeddedWebServer { +@@ -35,7 +35,7 @@ public class EmbeddedWebServer { private static String EMPTY = ""; Server server = null; @@ -123,7 +122,7 @@ index 82cd436..08cd9df 100644 ServletContextHandler handler; boolean usingSsl; -@@ -45,13 +45,13 @@ public class EmbeddedWebServer { +@@ -48,13 +48,13 @@ public class EmbeddedWebServer { final AccumuloConfiguration conf = Monitor.getSystemConfiguration(); if (EMPTY.equals(conf.get(Property.MONITOR_SSL_KEYSTORE)) || EMPTY.equals(conf.get(Property.MONITOR_SSL_KEYSTOREPASS)) || EMPTY.equals(conf.get(Property.MONITOR_SSL_TRUSTSTORE)) || EMPTY.equals(conf.get(Property.MONITOR_SSL_TRUSTSTOREPASS))) { @@ -139,45 +138,57 @@ index 82cd436..08cd9df 100644 sslContextFactory.setTrustStorePassword(conf.get(Property.MONITOR_SSL_TRUSTSTOREPASS)); final String includedCiphers = conf.get(Property.MONITOR_SSL_INCLUDE_CIPHERS); -@@ -63,8 +63,7 @@ public class EmbeddedWebServer { - if (!Property.MONITOR_SSL_EXCLUDE_CIPHERS.getDefaultValue().equals(excludedCiphers)) { - sslContextFactory.setExcludeCipherSuites(StringUtils.split(excludedCiphers, ',')); +@@ -72,7 +72,7 @@ public class EmbeddedWebServer { + sslContextFactory.setIncludeProtocols(StringUtils.split(includeProtocols, ',')); } -- + - connector = new SslSelectChannelConnector(sslContextFactory); + connector = new ServerConnector(server, sslContextFactory); usingSsl = true; } diff --git a/start/pom.xml b/start/pom.xml -index e6d0241..2b046c5 100644 +index 9f74aff..bd36449 100644 --- a/start/pom.xml +++ b/start/pom.xml -@@ -76,11 +76,6 @@ - test - - -- org.mortbay.jetty -- jetty -- test -- -- - org.powermock - powermock-api-easymock - test +@@ -109,24 +109,4 @@ + + + +- +- +- +- hadoop-1 +- +- +- hadoop.profile +- 1 +- +- +- +- +- org.mortbay.jetty +- jetty +- test +- +- +- +- + diff --git a/test/pom.xml b/test/pom.xml -index 64ee738..a55ac4e 100644 +index 8d8b838..13998c3 100644 --- a/test/pom.xml +++ b/test/pom.xml -@@ -168,11 +168,6 @@ - test - - -- org.mortbay.jetty -- jetty -- test -- -- - org.slf4j - slf4j-log4j12 - test +@@ -307,11 +307,6 @@ + hadoop-tools + test + +- +- org.mortbay.jetty +- jetty +- test +- + + +