rpms/accumulo
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix patches for 1.6.4

Browse source
This commit is contained in:
Christopher Tubbs 2015-11-05 18:31:09 -05:00
commit 40b9a95674
7 changed files with 126 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

10
accumulo.spec
View file

@ -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 <ctubbsii-fedora@apache.org> - 1.6.4-2
- Fix patches for 1.6.4
* Thu Nov 05 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 1.6.4-1
- Update to 1.6.4

8
commons-configuration.patch
View file

@ -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 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>

2
commons-math.patch
View file

@ -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 @@

53
default-conf.patch
View file

@ -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
<!--
Enable/Disable metrics accumulation on the different servers and their components
diff --git a/assemble/conf/templates/accumulo-site.xml b/assemble/conf/templates/accumulo-site.xml
index 052ed7e..7d90774 100644
index 7fe3fe4..a9e29e1 100644
--- a/assemble/conf/templates/accumulo-site.xml
+++ b/assemble/conf/templates/accumulo-site.xml
@@ -22,6 +22,12 @@
@@ -22,18 +22,15 @@
you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
<property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- <description>comma separated list of zookeeper servers</description>
+ <name>instance.volumes</name>
+ <value>file:///tmp/accumulo</value>
+ <description>comma separated list of dfs URIs</description>
+ </property>
+
+ <property>
<name>instance.zookeeper.host</name>
<value>localhost:2181</value>
<description>comma separated list of zookeeper servers</description>
@@ -28,15 +28,6 @@
</property>
<property>
@ -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.
- </description>
- </property>
-
- <property>
<name>instance.secret</name>
<value>DEFAULT</value>
<description>A secret unique to a given instance that all servers must know in order to communicate with one another.
@@ -89,44 +80,13 @@
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
</property>
<property>
@@ -89,49 +86,13 @@
${mvnProjBaseDir}
<property>
<name>general.classpaths</name>
@ -58,34 +54,39 @@ index 052ed7e..7d90774 100644
- $ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/lib/accumulo-proxy.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- <!-- End Accumulo requirements -->
-
- <!-- ZooKeeper requirements -->
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- <!-- End ZooKeeper requirements -->
-
- <!-- Common Hadoop requirements -->
- $HADOOP_CONF_DIR,
- <!-- End Common Hadoop requirements -->
-
- <!-- Hadoop 2 requirements -->
- $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,
- <!-- End Hadoop 2 requirements -->
- <!-- HDP 2.0 requirements -->
- /usr/lib/hadoop/[^.].*.jar,
- /usr/lib/hadoop/lib/[^.].*.jar,
- /usr/lib/hadoop-hdfs/[^.].*.jar,
- /usr/lib/hadoop-mapreduce/[^.].*.jar,
- /usr/lib/hadoop-yarn/[^.].*.jar,
- <!-- End Hadoop 2 requirements -->
-
- /usr/lib/hadoop-yarn/lib/jersey.*.jar,
- <!-- End HDP 2.0 requirements -->
- <!-- HDP 2.2 requirements -->
- /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
- <!-- End HDP 2.2 requirements -->
- <!-- Hadoop 1 requirements -->
- $HADOOP_PREFIX/[^.].*.jar,
- $HADOOP_PREFIX/lib/(?!slf4j)[^.].*.jar,
- <!-- End Hadoop 1 requirements -->
-
- </value>
+ <value>/etc/accumulo/lib</value>
<description>Classpaths that accumulo checks for updates and class files.</description>

18
disabled-tests.patch
View file

@ -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

115
jetty9.patch
View file

@ -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
</dependency>
<dependency>
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
<include>org.eclipse.jetty:jetty-io</include>
<include>org.eclipse.jetty:jetty-security</include>
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 @@
<!-- overwritten in profiles hadoop-1 or hadoop-2 -->
@@ -128,7 +128,7 @@
<hadoop.version>2.2.0</hadoop.version>
<httpclient.version>3.1</httpclient.version>
<java.ver>1.6</java.ver>
- <jetty.version>8.1.15.v20140411</jetty.version>
+ <jetty.version>9.1.5.v20140505</jetty.version>
<!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
<maven.min-version>3.0.4</maven.min-version>
<!-- surefire/failsafe plugin option -->
@@ -199,7 +199,7 @@
@@ -204,7 +204,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@ -47,7 +47,7 @@ index b0f9298..901c65d 100644
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -416,11 +416,6 @@
@@ -421,11 +421,6 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@ -59,20 +59,21 @@ index b0f9298..901c65d 100644
<artifactId>jetty-http</artifactId>
<version>${jetty.version}</version>
</dependency>
@@ -450,11 +445,6 @@
@@ -454,12 +449,6 @@
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <!-- Necessary for Hadoop-1 minidfs -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
- </dependency>
- <dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
<version>${powermock.version}</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
</dependency>
<dependency>
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 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
<scope>test</scope>
@@ -109,24 +109,4 @@
</plugins>
</pluginManagement>
</build>
- <profiles>
- <!-- profile for building against Hadoop 1.x
- Activate using: mvn -Dhadoop.profile=1 -->
- <profile>
- <id>hadoop-1</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>1</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
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 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
@@ -307,11 +307,6 @@
<artifactId>hadoop-tools</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</profile>
<!-- profile for building against Hadoop 2.x

28
native-code.patch
View file

@ -1,18 +1,5 @@
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index a454d6c..f3015d8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -62,7 +62,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
// Load native library
static {
// Check standard directories
- List<File> directories = new ArrayList<File>(Arrays.asList(new File[] {new File("/usr/lib64"), new File("/usr/lib")}));
+ List<File> directories = new ArrayList<File>(Arrays.asList(new File[] {new File("/usr/lib64/accumulo"), new File("/usr/lib/accumulo")}));
// Check in ACCUMULO_HOME location, too
String envAccumuloHome = System.getenv("ACCUMULO_HOME");
if (envAccumuloHome != null) {
diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile
index b9211aa..0e93467 100644
index 9ffeefe..102c253 100644
--- a/server/native/src/main/resources/Makefile
+++ b/server/native/src/main/resources/Makefile
@@ -26,7 +26,7 @@ ifeq ($(shell uname),Linux)
@ -24,3 +11,16 @@ index b9211aa..0e93467 100644
endif
ifeq ($(shell uname),Darwin)
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index f728a9b..4a056f0 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -62,7 +62,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
// Load native library
static {
// Check standard directories
- List<File> directories = new ArrayList<File>(Arrays.asList(new File[] {new File("/usr/lib64"), new File("/usr/lib")}));
+ List<File> directories = new ArrayList<File>(Arrays.asList(new File[] {new File("/usr/lib64/accumulo"), new File("/usr/lib/accumulo")}));
// Check in ACCUMULO_HOME location, too
String envAccumuloHome = System.getenv("ACCUMULO_HOME");
if (envAccumuloHome != null) {