Compare commits
25 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
cb2ee9d0b3 | ||
|
a9fa5f6b1c | ||
|
|
660822d37b | ||
|
cc9ce58609 | ||
|
cd511b7139 | ||
|
c2aae08074 | ||
|
|
1fbe5dfa7b | ||
|
|
c8b69a318f | ||
|
|
68ce91e96d | ||
|
|
5c5f08dec1 | ||
|
|
6ad9d045ae | ||
|
|
3cc8ddfe85 | ||
|
|
22c3492cfa | ||
|
f606f56ab9 | ||
|
|
fe53ce34ee | ||
|
|
bf938379d5 | ||
|
|
e06f13c2af | ||
|
|
17ef3e08ab | ||
|
|
8f874d5641 | ||
|
|
c98bebd90b | ||
|
|
e53541126e | ||
|
|
156ebd009e | ||
|
|
d3b7ecff0a | ||
|
|
85362cc47c | ||
|
|
6dd5353899 |
20 changed files with 1 additions and 2387 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -1,5 +0,0 @@
|
|||
/accumulo-1.6.0-0616258.tar.gz
|
||||
/accumulo-1.6.1-src.tar.gz
|
||||
/accumulo-1.6.2-src.tar.gz
|
||||
/accumulo-1.6.4-src.tar.gz
|
||||
/accumulo-1.6.6-src.tar.gz
|
||||
1164
ACCUMULO-3470.patch
1164
ACCUMULO-3470.patch
File diff suppressed because it is too large
Load diff
|
|
@ -1,12 +0,0 @@
|
|||
[Unit]
|
||||
Description=Apache Accumulo Garbage Collector service
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
User=accumulo
|
||||
Group=accumulo
|
||||
ExecStart=/usr/bin/accumulo gc
|
||||
SuccessExitStatus=143
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
[Unit]
|
||||
Description=Apache Accumulo Master service
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
User=accumulo
|
||||
Group=accumulo
|
||||
ExecStart=/usr/bin/accumulo master
|
||||
SuccessExitStatus=143
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
[Unit]
|
||||
Description=Apache Accumulo Monitor service
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
User=accumulo
|
||||
Group=accumulo
|
||||
ExecStart=/usr/bin/accumulo monitor
|
||||
SuccessExitStatus=143
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
[Unit]
|
||||
Description=Apache Accumulo Tracer service
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
User=accumulo
|
||||
Group=accumulo
|
||||
ExecStart=/usr/bin/accumulo tracer
|
||||
SuccessExitStatus=143
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
[Unit]
|
||||
Description=Apache Accumulo TServer service
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
User=accumulo
|
||||
Group=accumulo
|
||||
ExecStart=/usr/bin/accumulo tserver
|
||||
SuccessExitStatus=143
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
#!/usr/bin/bash
|
||||
|
||||
# This file is sourced by /usr/bin/accumulo before launching java. It will use
|
||||
# the $ACCUMULO_OPTS environment variable created here to add options to the
|
||||
# java command line. This file can be overridden per-user by creating a
|
||||
# $HOME/.accumulorc to be sourced after this file.
|
||||
|
||||
# The $1 parameter is passed with the first argument provided to
|
||||
# /usr/bin/accumulo, which is usually the name of the accumulo service or
|
||||
# function to run.
|
||||
|
||||
# Append some common arguments
|
||||
#
|
||||
# Note: app isn't used for anything, but makes it easier to locate services
|
||||
# quickly with ps/top/etc output
|
||||
ACCUMULO_OPTS=("-Dapp=$1" '-XX:+UseConcMarkSweepGC' '-XX:CMSInitiatingOccupancyFraction=75' '-Djava.net.preferIPv4Stack=true' '-XX:-OmitStackTraceInFastThrow' '-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl' '-XX:OnOutOfMemoryError=kill -9 %p')
|
||||
|
||||
# Append some service-specific arguments
|
||||
case "$1" in
|
||||
gc) ACCUMULO_OPTS=("${ACCUMULO_OPTS[@]}" '-Xmx256m' '-Xms256m') ;;
|
||||
master) ACCUMULO_OPTS=("${ACCUMULO_OPTS[@]}" '-Xmx1g' '-Xms1g') ;;
|
||||
monitor) ACCUMULO_OPTS=("${ACCUMULO_OPTS[@]}" '-Xmx1g' '-Xms256m') ;;
|
||||
tserver) ACCUMULO_OPTS=("${ACCUMULO_OPTS[@]}" '-Xmx1g' '-Xms1g' '-XX:NewSize=500m' '-XX:MaxNewSize=500m') ;;
|
||||
*) ACCUMULO_OPTS=("${ACCUMULO_OPTS[@]}" '-Xmx1g' '-Xms256m') ;;
|
||||
esac
|
||||
|
||||
# Set this because it's read by the VFS classloader
|
||||
export ACCUMULO_HOME=/etc/accumulo
|
||||
# Set these because they could be referenced by logger configuration
|
||||
export ACCUMULO_CONF_DIR=/etc/accumulo
|
||||
export ACCUMULO_LOG_DIR=/var/log/accumulo
|
||||
|
||||
# See HADOOP-7154 and ACCUMULO-847
|
||||
export MALLOC_ARENA_MAX=1
|
||||
614
accumulo.spec
614
accumulo.spec
|
|
@ -1,614 +0,0 @@
|
|||
%global _hardened_build 1
|
||||
%global longproj Apache Accumulo
|
||||
|
||||
# jpackage main class
|
||||
%global main_class org.apache.%{name}.start.Main
|
||||
|
||||
Name: accumulo
|
||||
Version: 1.6.6
|
||||
Release: 13%{?dist}
|
||||
Summary: A software platform for processing vast amounts of data
|
||||
License: ASL 2.0
|
||||
Group: Development/Libraries
|
||||
URL: https://%{name}.apache.org
|
||||
Source0: https://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}-src.tar.gz
|
||||
|
||||
# systemd service files
|
||||
Source1: %{name}-master.service
|
||||
Source2: %{name}-tserver.service
|
||||
Source3: %{name}-gc.service
|
||||
Source4: %{name}-tracer.service
|
||||
Source5: %{name}-monitor.service
|
||||
|
||||
# Java configuration file for Fedora
|
||||
Source6: %{name}.conf
|
||||
|
||||
# Use Jetty version 9 instead of 8
|
||||
Patch0: jetty9.patch
|
||||
# Use current version of commons-configuration
|
||||
Patch1: commons-configuration.patch
|
||||
# Use current version of commons-math
|
||||
Patch2: commons-math.patch
|
||||
# Apply Fedora JNI conventions
|
||||
Patch3: native-code.patch
|
||||
# Disable broken tests
|
||||
Patch4: disabled-tests.patch
|
||||
# Patch upstream-provided example configuration for Fedora
|
||||
Patch5: default-conf.patch
|
||||
%if 0%{?fedora} > 24
|
||||
# Patch upstream ACCUMULO-3470 (update to commons-vfs 2.1)
|
||||
Patch6: ACCUMULO-3470.patch
|
||||
%endif
|
||||
# Fix for Shell erroneously reading accumulo-site.xml
|
||||
Patch7: shell-not-read-conf.patch
|
||||
# Fix for updating to flot 0.8 from 0.7 (adds flot.time)
|
||||
Patch8: flot8.patch
|
||||
# Workaround for https://github.com/jline/jline2/issues/205
|
||||
Patch9: jline-shell-workaround.patch
|
||||
|
||||
BuildRequires: apache-commons-cli
|
||||
BuildRequires: apache-commons-codec
|
||||
BuildRequires: apache-commons-collections
|
||||
BuildRequires: apache-commons-configuration
|
||||
BuildRequires: apache-commons-io
|
||||
BuildRequires: apache-commons-lang
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: apache-commons-math
|
||||
%if 0%{?fedora} > 24
|
||||
BuildRequires: apache-commons-vfs >= 2.1-7
|
||||
%else
|
||||
BuildRequires: apache-commons-vfs < 2.1
|
||||
%endif
|
||||
BuildRequires: beust-jcommander
|
||||
BuildRequires: bouncycastle
|
||||
BuildRequires: exec-maven-plugin
|
||||
BuildRequires: google-gson
|
||||
BuildRequires: guava
|
||||
BuildRequires: hadoop-client
|
||||
BuildRequires: hadoop-tests
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: jetty-security
|
||||
BuildRequires: jetty-server
|
||||
BuildRequires: jetty-servlet
|
||||
BuildRequires: jetty-util
|
||||
BuildRequires: jline2
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: libthrift-java
|
||||
BuildRequires: log4j12
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
||||
BuildRequires: native-maven-plugin
|
||||
BuildRequires: powermock-api-easymock
|
||||
BuildRequires: powermock-core
|
||||
BuildRequires: powermock-junit4
|
||||
BuildRequires: slf4j
|
||||
BuildRequires: systemd-units
|
||||
BuildRequires: zookeeper-java
|
||||
|
||||
Requires: %{name}-core = %{version}-%{release}
|
||||
Requires: %{name}-master = %{version}-%{release}
|
||||
Requires: %{name}-tserver = %{version}-%{release}
|
||||
Requires: %{name}-gc = %{version}-%{release}
|
||||
Requires: %{name}-monitor = %{version}-%{release}
|
||||
Requires: %{name}-tracer = %{version}-%{release}
|
||||
Requires: %{name}-examples = %{version}-%{release}
|
||||
Requires: %{name}-native%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
%package core
|
||||
Summary: Libraries for %{longproj} Java clients
|
||||
# the bloom filter code is BSD licensed, everything else is ASL 2.0
|
||||
License: ASL 2.0 and BSD
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
Requires(pre): /usr/sbin/useradd
|
||||
Obsoletes: %{name}-javadoc < 1.6.0-5%{?dist}
|
||||
|
||||
%description core
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
This package provides libraries for %{longproj} clients.
|
||||
|
||||
%package server-base
|
||||
Summary: The %{longproj} Server Base libraries
|
||||
License: ASL 2.0
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-core = %{version}-%{release}
|
||||
|
||||
%description server-base
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
This package provides jars for other %{longproj} services.
|
||||
|
||||
%package master
|
||||
Summary: The %{longproj} Master service
|
||||
License: ASL 2.0
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-core = %{version}-%{release}
|
||||
Requires: %{name}-server-base = %{version}-%{release}
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
|
||||
%description master
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
This package provides the master service for %{longproj}.
|
||||
|
||||
%package tserver
|
||||
Summary: The %{longproj} TServer service
|
||||
License: ASL 2.0
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-core = %{version}-%{release}
|
||||
Requires: %{name}-server-base = %{version}-%{release}
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
|
||||
%description tserver
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
This package provides the tserver service for %{longproj}.
|
||||
|
||||
%package gc
|
||||
Summary: The %{longproj} Garbage Collector service
|
||||
License: ASL 2.0
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-core = %{version}-%{release}
|
||||
Requires: %{name}-server-base = %{version}-%{release}
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
|
||||
%description gc
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
This package provides the gc service for %{longproj}.
|
||||
|
||||
%package monitor
|
||||
Summary: The %{longproj} Monitor service
|
||||
License: ASL 2.0
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-core = %{version}-%{release}
|
||||
Requires: %{name}-server-base = %{version}-%{release}
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
Requires: nodejs-flot
|
||||
Requires: js-jquery1
|
||||
|
||||
%description monitor
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
This package provides the monitor service for %{longproj}.
|
||||
|
||||
%package tracer
|
||||
Summary: The %{longproj} Tracer service
|
||||
License: ASL 2.0
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-core = %{version}-%{release}
|
||||
Requires: %{name}-server-base = %{version}-%{release}
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
|
||||
%description tracer
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
This package provides the tracer service for %{longproj}.
|
||||
|
||||
%package examples
|
||||
Summary: Examples for %{longproj}
|
||||
License: ASL 2.0
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-core = %{version}-%{release}
|
||||
|
||||
%description examples
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
This package provides examples for %{longproj}.
|
||||
|
||||
%package native
|
||||
Summary: Native libraries for %{longproj}
|
||||
License: ASL 2.0
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-tserver = %{version}-%{release}
|
||||
|
||||
%description native
|
||||
%{longproj} is a sorted, distributed key/value store based on Google's
|
||||
BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It
|
||||
features a few novel improvements on the BigTable design in the form of
|
||||
cell-level access labels and a server-side programming mechanism that can
|
||||
modify key/value pairs at various points in the data management process.
|
||||
|
||||
This package provides native code for %{longproj}'s TServer.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
# Remove flot and jquery bundling from upstream tarball
|
||||
rm -rf server/monitor/src/main/resources/web/flot/
|
||||
|
||||
# Update dependency versions
|
||||
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='jline']/pom:version" "2.10"
|
||||
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='zookeeper']/pom:version" "3.4.5"
|
||||
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='libthrift']/pom:version" "0.9.1"
|
||||
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='log4j']/pom:version" "1.2.17"
|
||||
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='commons-math']/pom:version" "3.2"
|
||||
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='commons-math']/pom:artifactId" "commons-math3"
|
||||
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='commons-math']/pom:artifactId" "commons-math3" core
|
||||
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='bcprov-jdk15on']/pom:artifactId" "bcprov-jdk16"
|
||||
|
||||
# Remove enforcer animal-sniffer rule
|
||||
%pom_xpath_remove "pom:project/pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-enforcer-plugin']/pom:dependencies"
|
||||
%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-enforcer-plugin']/pom:executions/pom:execution[pom:id='enforce-java-signatures']"
|
||||
|
||||
# Disable unneeded/unused modules
|
||||
%pom_disable_module test
|
||||
%pom_disable_module proxy
|
||||
%pom_disable_module maven-plugin
|
||||
%pom_disable_module docs
|
||||
%pom_disable_module assemble
|
||||
# Mini isn't needed
|
||||
%pom_disable_module minicluster
|
||||
|
||||
# Remove unneeded plugins
|
||||
%pom_remove_plugin :maven-checkstyle-plugin
|
||||
%pom_remove_plugin :maven-site-plugin
|
||||
%pom_remove_plugin :maven-failsafe-plugin
|
||||
%pom_remove_plugin :apache-rat-plugin
|
||||
%pom_remove_plugin :sortpom-maven-plugin
|
||||
%pom_remove_plugin :mavanagaiata
|
||||
%pom_remove_plugin :findbugs-maven-plugin
|
||||
%pom_remove_plugin :maven-java-formatter-plugin
|
||||
%pom_remove_plugin :modernizer-maven-plugin
|
||||
|
||||
# Mini isn't needed
|
||||
#%%mvn_package ":%%{name}-minicluster" __noinstall
|
||||
%mvn_package ":%{name}-{project,core,fate,trace,start}" core
|
||||
%mvn_package ":%{name}-examples-simple" examples
|
||||
%mvn_package ":%{name}-gc" gc
|
||||
%mvn_package ":%{name}-master" master
|
||||
%mvn_package ":%{name}-monitor" monitor
|
||||
%mvn_package ":%{name}-server-base" server-base
|
||||
%mvn_package ":%{name}-tracer" tracer
|
||||
%mvn_package ":%{name}-tserver" tserver
|
||||
|
||||
# build native, but skip install; JNI *.so is copied manually
|
||||
%mvn_package ":%{name}-native" __noinstall
|
||||
|
||||
%build
|
||||
# TODO Unit tests are skipped, because upstream tries to do some integration
|
||||
# testing in the unit tests, and they expect certain resources and dependencies
|
||||
# that are not typically available, or are too complicated to configure,
|
||||
# especially in the start jar. These should be enabled when possible.
|
||||
# ITs are skipped, because they time out frequently and take too many resources
|
||||
# to run reliably. Failures do not reliably indicate meaningful issues.
|
||||
%mvn_build -j -- -DforkCount=1C -DskipTests -DskipITs
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
# create symlink for system-provided web assets to be added to classpath
|
||||
install -d -m 755 %{buildroot}%{_datadir}/%{name}/lib/web
|
||||
rm -f %{buildroot}%{_datadir}/%{name}/lib/web/flot
|
||||
ln -s %{_usr}/lib/node_modules/flot %{buildroot}%{_datadir}/%{name}/lib/web/flot
|
||||
|
||||
# native libs
|
||||
install -d -m 755 %{buildroot}%{_libdir}/%{name}
|
||||
install -d -m 755 %{buildroot}%{_var}/cache/%{name}
|
||||
install -p -m 755 server/native/target/%{name}-native-%{version}/%{name}-native-%{version}/lib%{name}.so %{buildroot}%{_libdir}/%{name}
|
||||
|
||||
# generate default config for Fedora from upstream examples
|
||||
install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
|
||||
install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/lib
|
||||
install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/lib/ext
|
||||
assemble/bin/bootstrap_config.sh -o -d %{buildroot}%{_sysconfdir}/%{name} -s 3GB -n -v 2
|
||||
for x in gc masters monitor slaves tracers %{name}-env.sh generic_logger.xml generic_logger.properties monitor_logger.xml monitor_logger.properties %{name}.policy.example; do rm -f %{buildroot}%{_sysconfdir}/%{name}/$x; done
|
||||
cp %{buildroot}%{_sysconfdir}/%{name}/log4j.properties %{buildroot}%{_sysconfdir}/%{name}/generic_logger.properties
|
||||
cp %{buildroot}%{_sysconfdir}/%{name}/log4j.properties %{buildroot}%{_sysconfdir}/%{name}/monitor_logger.properties
|
||||
|
||||
# main launcher
|
||||
%jpackage_script %{main_class} "" "" %{name}:%{name}/%{name}-tserver:jetty:servlet:avro/avro:apache-commons-io:apache-commons-cli:apache-commons-codec:apache-commons-collections:apache-commons-configuration:apache-commons-lang:apache-commons-logging:apache-commons-math:apache-commons-vfs:beust-jcommander:google-gson:guava:hadoop/hadoop-auth:hadoop/hadoop-common:hadoop/hadoop-hdfs:jansi/jansi:jline/jline:libthrift:log4j-1.2.17:slf4j/slf4j-api:slf4j/slf4j-log4j12:zookeeper/zookeeper:protobuf-java %{name} true
|
||||
# fixup the generated jpackage script
|
||||
sed -i -e 's/^#!\/bin\/sh$/#!\/usr\/bin\/bash/' %{buildroot}%{_bindir}/%{name}
|
||||
# ensure the java configuration options know which service is being called
|
||||
sed -i -e 's/^\s*\.\s\s*\/etc\/java\/'%{name}'\.conf/& "\$1"/' %{buildroot}%{_bindir}/%{name}
|
||||
sed -i -e 's/^\s*\.\s\s*\$HOME\/\.'%{name}'rc$/& "\$1"/' %{buildroot}%{_bindir}/%{name}
|
||||
# options may have spaces in them, so replace run with an exec that properly
|
||||
# parses arguments as arrays.
|
||||
sed -i -e '/^run .*$/d' %{buildroot}%{_bindir}/%{name}
|
||||
sed -i -e '/^set_flags .*$/d' %{buildroot}%{_bindir}/%{name}
|
||||
sed -i -e '/^set_options .*$/d' %{buildroot}%{_bindir}/%{name}
|
||||
cat <<EOF >>%{buildroot}%{_bindir}/%{name}
|
||||
CLASSPATH="%{_sysconfdir}/%{name}:%{_datadir}/%{name}/lib/:\${CLASSPATH}"
|
||||
set_javacmd
|
||||
|
||||
if [ -n "\${VERBOSE}" ]; then
|
||||
echo "Java virtual machine used: \${JAVACMD}"
|
||||
echo "classpath used: \${CLASSPATH}"
|
||||
echo "main class used: \${MAIN_CLASS}"
|
||||
echo "flags used: \${FLAGS[*]}"
|
||||
echo "options used: \${ACCUMULO_OPTS[*]}"
|
||||
echo "arguments used: \${*}"
|
||||
fi
|
||||
|
||||
export CLASSPATH
|
||||
exec "\${JAVACMD}" "\${FLAGS[@]}" "\${ACCUMULO_OPTS[@]}" "\${MAIN_CLASS}" "\${@}"
|
||||
EOF
|
||||
|
||||
# scripts for services/utilities
|
||||
for service in master tserver shell init admin gc tracer classpath version rfile-info login-info zookeeper create-token info jar; do
|
||||
cat <<EOF >"%{name}-$service"
|
||||
#!/usr/bin/bash
|
||||
echo "%{name}-$service script is deprecated. Use '%{name} $service' instead." 1>&2
|
||||
%{_bindir}/%{name} $service "\$@"
|
||||
EOF
|
||||
install -p -m 755 %{name}-$service %{buildroot}%{_bindir}
|
||||
done
|
||||
|
||||
# systemd services
|
||||
install -d -m 755 %{buildroot}%{_unitdir}
|
||||
install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}-master.service
|
||||
install -p -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-tserver.service
|
||||
install -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}-gc.service
|
||||
install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}-tracer.service
|
||||
install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}-monitor.service
|
||||
|
||||
# java configuration file for Fedora
|
||||
install -d -m 755 %{buildroot}%{_javaconfdir}
|
||||
install -p -m 755 %{SOURCE6} %{buildroot}%{_javaconfdir}/%{name}.conf
|
||||
|
||||
%files
|
||||
|
||||
%files core -f .mfiles-core
|
||||
%doc LICENSE
|
||||
%doc README
|
||||
%doc NOTICE
|
||||
%dir %{_javadir}/%{name}
|
||||
%dir %{_mavenpomdir}/%{name}
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_datadir}/%{name}/lib
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/%{name}-shell
|
||||
%{_bindir}/%{name}-classpath
|
||||
%{_bindir}/%{name}-version
|
||||
%{_bindir}/%{name}-rfile-info
|
||||
%{_bindir}/%{name}-login-info
|
||||
%{_bindir}/%{name}-zookeeper
|
||||
%{_bindir}/%{name}-create-token
|
||||
%{_bindir}/%{name}-info
|
||||
%{_bindir}/%{name}-jar
|
||||
%attr(0750, %{name}, -) %dir %{_var}/cache/%{name}
|
||||
%attr(0755, %{name}, -) %dir %{_sysconfdir}/%{name}
|
||||
%attr(0755, %{name}, -) %dir %{_sysconfdir}/%{name}/lib
|
||||
%attr(0755, %{name}, -) %dir %{_sysconfdir}/%{name}/lib/ext
|
||||
%attr(0755, %{name}, -) %config(noreplace) %{_javaconfdir}/%{name}.conf
|
||||
%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/%{name}-metrics.xml
|
||||
%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/%{name}-site.xml
|
||||
%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/auditLog.xml
|
||||
%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/generic_logger.properties
|
||||
%attr(0644, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/log4j.properties
|
||||
%attr(0640, %{name}, -) %config(noreplace) %{_sysconfdir}/%{name}/monitor_logger.properties
|
||||
|
||||
%files server-base -f .mfiles-server-base
|
||||
%{_bindir}/%{name}-init
|
||||
%{_bindir}/%{name}-admin
|
||||
|
||||
%files master -f .mfiles-master
|
||||
%{_bindir}/%{name}-master
|
||||
%{_unitdir}/%{name}-master.service
|
||||
|
||||
%files tserver -f .mfiles-tserver
|
||||
%dir %{_jnidir}/%{name}
|
||||
%{_bindir}/%{name}-tserver
|
||||
%{_unitdir}/%{name}-tserver.service
|
||||
|
||||
%files gc -f .mfiles-gc
|
||||
%{_bindir}/%{name}-gc
|
||||
%{_unitdir}/%{name}-gc.service
|
||||
|
||||
%files monitor -f .mfiles-monitor
|
||||
%dir %{_datadir}/%{name}/lib/web
|
||||
%{_datadir}/%{name}/lib/web/flot
|
||||
%{_unitdir}/%{name}-monitor.service
|
||||
|
||||
%files tracer -f .mfiles-tracer
|
||||
%{_bindir}/%{name}-tracer
|
||||
%{_unitdir}/%{name}-tracer.service
|
||||
|
||||
%files examples -f .mfiles-examples
|
||||
|
||||
%files native
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/lib%{name}.so
|
||||
|
||||
%preun master
|
||||
%systemd_preun %{name}-master.service
|
||||
|
||||
%preun tserver
|
||||
%systemd_preun %{name}-tserver.service
|
||||
|
||||
%preun gc
|
||||
%systemd_preun %{name}-gc.service
|
||||
|
||||
%preun tracer
|
||||
%systemd_preun %{name}-tracer.service
|
||||
|
||||
%preun monitor
|
||||
%systemd_preun %{name}-monitor.service
|
||||
|
||||
%postun master
|
||||
%systemd_postun_with_restart %{name}-master.service
|
||||
|
||||
%postun tserver
|
||||
%systemd_postun_with_restart %{name}-tserver.service
|
||||
|
||||
%postun gc
|
||||
%systemd_postun_with_restart %{name}-gc.service
|
||||
|
||||
%postun tracer
|
||||
%systemd_postun_with_restart %{name}-tracer.service
|
||||
|
||||
%postun monitor
|
||||
%systemd_postun_with_restart %{name}-monitor.service
|
||||
|
||||
%pre core
|
||||
getent group %{name} >/dev/null || /usr/sbin/groupadd -r %{name}
|
||||
getent passwd %{name} >/dev/null || /usr/sbin/useradd --comment "%{longproj}" --shell /sbin/nologin -M -r -g %{name} --home %{_var}/cache/%{name} %{name}
|
||||
|
||||
%post master
|
||||
%systemd_post %{name}-master.service
|
||||
|
||||
%post tserver
|
||||
%systemd_post %{name}-tserver.service
|
||||
|
||||
%post gc
|
||||
%systemd_post %{name}-gc.service
|
||||
|
||||
%post tracer
|
||||
%systemd_post %{name}-tracer.service
|
||||
|
||||
%post monitor
|
||||
%systemd_post %{name}-monitor.service
|
||||
|
||||
%changelog
|
||||
* Tue Dec 06 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-13
|
||||
- Fix missing protobuf-java and hadoop config classpath bug, and systemd exit
|
||||
code problems
|
||||
|
||||
* Mon Dec 05 2016 Mike Miller <milleruntime@fedoraproject.org> - 1.6.6-12
|
||||
- Another fix for Shell erroneously reading accumulo-site.xml
|
||||
|
||||
* Fri Dec 02 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-11
|
||||
- Vastly simplify out-of-box configuration and fix missing avro jar
|
||||
|
||||
* Fri Dec 02 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-10
|
||||
- Add google-gson to classpath for monitor REST service
|
||||
|
||||
* Fri Dec 02 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-9
|
||||
- Include Monitor (bz#1132725)
|
||||
|
||||
* Thu Nov 03 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-8
|
||||
- Re-enable VFS 2.1 HDFS Provider (bz#1387110)
|
||||
|
||||
* Wed Nov 02 2016 Mike Miller <mmiller@apache.org> - 1.6.6-7
|
||||
- Fix for Shell erroneously reading accumulo-site.xml
|
||||
|
||||
* Fri Oct 28 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-6
|
||||
- fix classpath (bz#1389325) and log to console
|
||||
|
||||
* Thu Oct 20 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-5
|
||||
- Use commons-vfs 2.1 patch from upstream for f25+
|
||||
|
||||
* Thu Oct 20 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-4
|
||||
- Fix whitespace in native patch for fuzz=0 opt in f25+
|
||||
|
||||
* Thu Oct 20 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-3
|
||||
- Remove animal sniffer enforcer rule
|
||||
|
||||
* Thu Oct 20 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-2
|
||||
- Remove modernizer plugin
|
||||
|
||||
* Wed Oct 19 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-1
|
||||
- Update to 1.6.6
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Nov 12 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 1.6.4-4
|
||||
- Use autosetup macro to apply patches
|
||||
|
||||
* Thu Nov 05 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 1.6.4-3
|
||||
- Remove unnecessary checkstyle plugin
|
||||
|
||||
* 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
|
||||
|
||||
* Thu Jun 25 2015 Christopher Tubbs <ctubbsii@apache> - 1.6.2-1
|
||||
- Update to 1.6.2 bugfix release
|
||||
|
||||
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon May 04 2015 Kalev Lember <kalevlember@gmail.com> - 1.6.1-4
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Wed Apr 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.6.1-3
|
||||
- ARMv7 now has hadoop
|
||||
|
||||
* Tue Dec 16 2014 Christopher Tubbs <ctubbsii@apache> - 1.6.1-2
|
||||
- Remove mortbay Jetty deps
|
||||
|
||||
* Tue Dec 16 2014 Christopher Tubbs <ctubbsii@apache> - 1.6.1-1
|
||||
- Update to 1.6.1
|
||||
|
||||
* Sun Sep 7 2014 Ville Skyttä <ville.skytta@iki.fi> - 1.6.0-7
|
||||
- Fix -debuginfo
|
||||
|
||||
* Thu Aug 21 2014 Christopher Tubbs <ctubbsii@apache> - 1.6.0-6
|
||||
- Skip javadoc generation in mvn_build when not used
|
||||
|
||||
* Wed Aug 20 2014 Christopher Tubbs <ctubbsii@apache> - 1.6.0-5
|
||||
- Use jpackage_script macro, standard java env, and working example config
|
||||
|
||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Wed Jul 16 2014 Christopher Tubbs <ctubbsii@apache> - 1.6.0-3
|
||||
- Fix broken service launch scripts
|
||||
- Add conditional for lib directory to build for f20
|
||||
|
||||
* Wed Jul 9 2014 Christopher Tubbs <ctubbsii@apache> - 1.6.0-2
|
||||
- Add conditional for pom directory to build for f20
|
||||
- Remove fno-strict-aliasing flag based on upstream ACCUMULO-2762
|
||||
|
||||
* Wed Apr 30 2014 Christopher Tubbs <ctubbsii@apache> - 1.6.0-1
|
||||
- Initial packaging
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
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 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
|
||||
@@ -713,7 +713,8 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
|
||||
|
||||
@Override
|
||||
public ClientConfiguration getClientConfig() {
|
||||
- return new ClientConfiguration(Arrays.asList(new MapConfiguration(config.getSiteConfig()))).withInstance(this.getInstanceName()).withZkHosts(
|
||||
+ MapConfiguration array = new MapConfiguration((Map<String, Object>)(Map<String, ?>)config.getSiteConfig());
|
||||
+ return new ClientConfiguration(Arrays.asList(array)).withInstance(this.getInstanceName()).withZkHosts(
|
||||
this.getZooKeepers());
|
||||
}
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 3d0d903..8c3d880 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -179,7 +179,7 @@
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
- <version>1.6</version>
|
||||
+ <version>1.9</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-httpclient</groupId>
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
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..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 @@
|
||||
*/
|
||||
package org.apache.accumulo.core.util;
|
||||
|
||||
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatistic;
|
||||
-import org.apache.commons.math.stat.descriptive.moment.Mean;
|
||||
-import org.apache.commons.math.stat.descriptive.moment.StandardDeviation;
|
||||
-import org.apache.commons.math.stat.descriptive.rank.Max;
|
||||
-import org.apache.commons.math.stat.descriptive.rank.Min;
|
||||
-import org.apache.commons.math.stat.descriptive.summary.Sum;
|
||||
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatistic;
|
||||
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
|
||||
+import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation;
|
||||
+import org.apache.commons.math3.stat.descriptive.rank.Max;
|
||||
+import org.apache.commons.math3.stat.descriptive.rank.Min;
|
||||
+import org.apache.commons.math3.stat.descriptive.summary.Sum;
|
||||
|
||||
public class Stat {
|
||||
Min min;
|
||||
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
|
||||
index d2d560e..2fdfd62 100644
|
||||
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
|
||||
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
|
||||
@@ -64,7 +64,7 @@
|
||||
import org.apache.accumulo.core.iterators.system.LocalityGroupIterator.LocalityGroup;
|
||||
import org.apache.accumulo.core.util.MutableByteSequence;
|
||||
import org.apache.commons.lang.mutable.MutableLong;
|
||||
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
|
||||
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
|
||||
import org.apache.hadoop.io.Writable;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Orphaned for 6+ weeks
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
diff --git a/assemble/conf/templates/accumulo-metrics.xml b/assemble/conf/templates/accumulo-metrics.xml
|
||||
index ec54994..04edb84 100644
|
||||
--- a/assemble/conf/templates/accumulo-metrics.xml
|
||||
+++ b/assemble/conf/templates/accumulo-metrics.xml
|
||||
@@ -23,7 +23,8 @@
|
||||
Metrics log directory
|
||||
-->
|
||||
<logging>
|
||||
- <dir>${ACCUMULO_HOME}/metrics</dir>
|
||||
+ <!-- This is just an example location; select something appropriate for you -->
|
||||
+ <dir>/var/log/accumulo/metrics</dir>
|
||||
</logging>
|
||||
<!--
|
||||
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 7fe3fe4..a9e29e1 100644
|
||||
--- a/assemble/conf/templates/accumulo-site.xml
|
||||
+++ b/assemble/conf/templates/accumulo-site.xml
|
||||
@@ -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>logger.dir.walog</name>
|
||||
- <value>walogs</value>
|
||||
- <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
|
||||
- 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>
|
||||
+ <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>
|
||||
-
|
||||
- <value>
|
||||
- <!-- Accumulo requirements -->
|
||||
- $ACCUMULO_HOME/lib/accumulo-server.jar,
|
||||
- $ACCUMULO_HOME/lib/accumulo-core.jar,
|
||||
- $ACCUMULO_HOME/lib/accumulo-start.jar,
|
||||
- $ACCUMULO_HOME/lib/accumulo-fate.jar,
|
||||
- $ACCUMULO_HOME/lib/accumulo-proxy.jar,
|
||||
- $ACCUMULO_HOME/lib/[^.].*.jar,
|
||||
- <!-- ZooKeeper requirements -->
|
||||
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
|
||||
- <!-- Common Hadoop requirements -->
|
||||
- $HADOOP_CONF_DIR,
|
||||
- <!-- 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,
|
||||
- /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,/etc/hadoop</value>
|
||||
<description>Classpaths that accumulo checks for updates and class files.</description>
|
||||
</property>
|
||||
+
|
||||
+ <property>
|
||||
+ <name>general.dynamic.classpaths</name>
|
||||
+ <value>/etc/accumulo/lib/ext</value>
|
||||
+ <description>Classpaths that accumulo checks for updates and class files to dynamically load.</description>
|
||||
+ </property>
|
||||
</configuration>
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
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 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
|
||||
@@ -53,6 +53,7 @@ import org.junit.After;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.Before;
|
||||
import org.junit.BeforeClass;
|
||||
+import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
@@ -60,6 +61,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest({Shell.class, ZooUtil.class, ConfigSanityCheck.class})
|
||||
+@Ignore // test skipped due to https://bugzilla.redhat.com/show_bug.cgi?id=1096992
|
||||
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/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;
|
||||
+import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
public class HistoryCommandTest {
|
||||
@@ -76,6 +77,7 @@ public class HistoryCommandTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
+ @Ignore // this test doesn't work in rpmbuild environment for some yet unknown reason
|
||||
public void testEventExpansion() throws IOException {
|
||||
// If we use an unsupported terminal, then history expansion doesn't work because JLine can't do magic buffer manipulations.
|
||||
// This has been observed to be the case on certain versions of Eclipse. However, mvn is usually fine.
|
||||
12
flot8.patch
12
flot8.patch
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
|
||||
index 75d5436..9660340 100644
|
||||
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
|
||||
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
|
||||
@@ -156,6 +156,7 @@ abstract public class BasicServlet extends HttpServlet {
|
||||
sb.append("<!--[if lte IE 8]><script language=\"javascript\" type=\"text/javascript\" src=\"/web/flot/excanvas.min.js\"></script><![endif]-->\n");
|
||||
sb.append("<script language=\"javascript\" type=\"text/javascript\" src=\"/web/flot/jquery.js\"></script>\n");
|
||||
sb.append("<script language=\"javascript\" type=\"text/javascript\" src=\"/web/flot/jquery.flot.js\"></script>\n");
|
||||
+ sb.append("<script language=\"javascript\" type=\"text/javascript\" src=\"/web/flot/jquery.flot.time.js\"></script>\n");
|
||||
|
||||
sb.append("</head>\n");
|
||||
|
||||
194
jetty9.patch
194
jetty9.patch
|
|
@ -1,194 +0,0 @@
|
|||
diff --git a/assemble/pom.xml b/assemble/pom.xml
|
||||
index db26388..49d127f 100644
|
||||
--- a/assemble/pom.xml
|
||||
+++ b/assemble/pom.xml
|
||||
@@ -126,10 +126,6 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
- <artifactId>jetty-continuation</artifactId>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-http</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
|
||||
index 96e1fbe..a0fd410 100644
|
||||
--- a/assemble/src/main/assemblies/component.xml
|
||||
+++ b/assemble/src/main/assemblies/component.xml
|
||||
@@ -35,7 +35,6 @@
|
||||
<include>org.apache.commons:commons-math</include>
|
||||
<include>org.apache.commons:commons-vfs2</include>
|
||||
<include>org.apache.thrift:libthrift</include>
|
||||
- <include>org.eclipse.jetty:jetty-continuation</include>
|
||||
<include>org.eclipse.jetty:jetty-http</include>
|
||||
<include>org.eclipse.jetty:jetty-io</include>
|
||||
<include>org.eclipse.jetty:jetty-security</include>
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index bd206e3..3d0d903 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -131,7 +131,7 @@
|
||||
<hadoop.version>2.2.0</hadoop.version>
|
||||
<httpclient.version>3.1</httpclient.version>
|
||||
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
|
||||
- <jetty.version>8.1.15.v20140411</jetty.version>
|
||||
+ <jetty.version>9.1.5.v20140505</jetty.version>
|
||||
<maven.compiler.source>1.6</maven.compiler.source>
|
||||
<maven.compiler.target>1.6</maven.compiler.target>
|
||||
<maven.min-version>3.0.5</maven.min-version>
|
||||
@@ -204,7 +204,7 @@
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
- <version>3.0.1</version>
|
||||
+ <version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
@@ -421,11 +421,6 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
- <artifactId>jetty-continuation</artifactId>
|
||||
- <version>${jetty.version}</version>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-http</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
</dependency>
|
||||
@@ -454,12 +449,6 @@
|
||||
<artifactId>jetty-util</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
</dependency>
|
||||
- <!-- Necessary for Hadoop-1 minidfs -->
|
||||
- <dependency>
|
||||
- <groupId>org.mortbay.jetty</groupId>
|
||||
- <artifactId>jetty</artifactId>
|
||||
- <version>6.1.26</version>
|
||||
- </dependency>
|
||||
<dependency>
|
||||
<groupId>org.powermock</groupId>
|
||||
<artifactId>powermock-api-easymock</artifactId>
|
||||
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
|
||||
index f3dcd4a..e8146be 100644
|
||||
--- a/server/monitor/pom.xml
|
||||
+++ b/server/monitor/pom.xml
|
||||
@@ -81,10 +81,6 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
- <artifactId>jetty-http</artifactId>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-security</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -101,7 +97,7 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
- <artifactId>jetty-continuation</artifactId>
|
||||
+ <artifactId>jetty-http</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</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 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
|
||||
@@ -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;
|
||||
+import org.eclipse.jetty.server.ServerConnector;
|
||||
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;
|
||||
@@ -35,7 +35,7 @@ public class EmbeddedWebServer {
|
||||
private static String EMPTY = "";
|
||||
|
||||
Server server = null;
|
||||
- SelectChannelConnector connector = null;
|
||||
+ ServerConnector connector = null;
|
||||
ServletContextHandler handler;
|
||||
boolean usingSsl;
|
||||
|
||||
@@ -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))) {
|
||||
- connector = new SelectChannelConnector();
|
||||
+ connector = new ServerConnector(server, new HttpConnectionFactory());
|
||||
usingSsl = false;
|
||||
} else {
|
||||
SslContextFactory sslContextFactory = new SslContextFactory();
|
||||
sslContextFactory.setKeyStorePath(conf.get(Property.MONITOR_SSL_KEYSTORE));
|
||||
sslContextFactory.setKeyStorePassword(conf.get(Property.MONITOR_SSL_KEYSTOREPASS));
|
||||
- sslContextFactory.setTrustStore(conf.get(Property.MONITOR_SSL_TRUSTSTORE));
|
||||
+ sslContextFactory.setTrustStorePath(conf.get(Property.MONITOR_SSL_TRUSTSTORE));
|
||||
sslContextFactory.setTrustStorePassword(conf.get(Property.MONITOR_SSL_TRUSTSTOREPASS));
|
||||
|
||||
final String includedCiphers = conf.get(Property.MONITOR_SSL_INCLUDE_CIPHERS);
|
||||
@@ -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 9f74aff..bd36449 100644
|
||||
--- a/start/pom.xml
|
||||
+++ b/start/pom.xml
|
||||
@@ -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 8d8b838..13998c3 100644
|
||||
--- a/test/pom.xml
|
||||
+++ b/test/pom.xml
|
||||
@@ -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
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
|
||||
index 9231c78..0336a67 100644
|
||||
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
|
||||
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
|
||||
@@ -646,9 +646,10 @@ public class Shell extends ShellOptions {
|
||||
}
|
||||
|
||||
public void printInfo() throws IOException {
|
||||
- reader.print("\n" + SHELL_DESCRIPTION + "\n" + "- \n" + "- version: " + Constants.VERSION + "\n" + "- instance name: "
|
||||
+ writer.print("\n" + SHELL_DESCRIPTION + "\n" + "- \n" + "- version: " + Constants.VERSION + "\n" + "- instance name: "
|
||||
+ connector.getInstance().getInstanceName() + "\n" + "- instance id: " + connector.getInstance().getInstanceID() + "\n" + "- \n"
|
||||
+ "- type 'help' for a list of available commands\n" + "- \n");
|
||||
+ writer.flush();
|
||||
reader.flush();
|
||||
}
|
||||
|
||||
@@ -676,7 +677,9 @@ public class Shell extends ShellOptions {
|
||||
}
|
||||
}
|
||||
sb.append("-\n");
|
||||
- reader.print(sb.toString());
|
||||
+ writer.print(sb.toString());
|
||||
+ writer.flush();
|
||||
+ reader.flush();
|
||||
}
|
||||
|
||||
public String getDefaultPrompt() {
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile
|
||||
index 9ffeefe..102c253 100644
|
||||
--- a/server/native/src/main/resources/Makefile
|
||||
+++ b/server/native/src/main/resources/Makefile
|
||||
@@ -30,7 +30,7 @@ ifeq ($(shell uname),Linux)
|
||||
JAVA_HOME=$(shell dirname "$$(dirname "$$(readlink -e "$$(which javah)")")")
|
||||
endif
|
||||
NATIVE_LIB := libaccumulo.so
|
||||
- CXXFLAGS=-g -fPIC -shared -O3 -Wall -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -Ijavah $(USERFLAGS)
|
||||
+ CXXFLAGS=$(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) -fPIC -shared -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -Ijavah $(USERFLAGS)
|
||||
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) {
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
|
||||
index 9231c78..233fbae 100644
|
||||
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
|
||||
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
|
||||
@@ -60,7 +60,6 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken;
|
||||
import org.apache.accumulo.core.conf.AccumuloConfiguration;
|
||||
import org.apache.accumulo.core.conf.DefaultConfiguration;
|
||||
import org.apache.accumulo.core.conf.Property;
|
||||
-import org.apache.accumulo.core.conf.SiteConfiguration;
|
||||
import org.apache.accumulo.core.data.Key;
|
||||
import org.apache.accumulo.core.data.Value;
|
||||
import org.apache.accumulo.core.data.thrift.TConstraintViolationSummary;
|
||||
@@ -463,7 +462,8 @@ public class Shell extends ShellOptions {
|
||||
if (instanceName == null) {
|
||||
instanceName = clientConfig.get(ClientProperty.INSTANCE_NAME);
|
||||
}
|
||||
- AccumuloConfiguration conf = SiteConfiguration.getInstance(ServerConfigurationUtil.convertClientConfig(DefaultConfiguration.getInstance(), clientConfig));
|
||||
+ // use ClientConfig since it should have everything we need
|
||||
+ AccumuloConfiguration conf = ServerConfigurationUtil.convertClientConfig(DefaultConfiguration.getInstance(), clientConfig);
|
||||
String keepers = getZooKeepers(keepersOption, clientConfig, conf);
|
||||
if (instanceName == null) {
|
||||
Path instanceDir = new Path(VolumeConfiguration.getVolumeUris(conf)[0], "instance_id");
|
||||
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
|
||||
index 2045eba..30b3e1e 100644
|
||||
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
|
||||
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
|
||||
@@ -280,7 +280,20 @@ public class ShellOptionsJC {
|
||||
if (useSsl()) {
|
||||
clientConfig.setProperty(ClientProperty.INSTANCE_RPC_SSL_ENABLED, "true");
|
||||
}
|
||||
+ if (getZooKeeperInstance().size() > 0) {
|
||||
+ List<String> zkOpts = getZooKeeperInstance();
|
||||
+ String instanceName = zkOpts.get(0);
|
||||
+ String hosts = zkOpts.get(1);
|
||||
+ clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, hosts);
|
||||
+ clientConfig.setProperty(ClientProperty.INSTANCE_NAME, instanceName);
|
||||
+ }
|
||||
|
||||
+ if (zooKeeperInstanceName != null && !getZooKeeperInstanceName().isEmpty()) {
|
||||
+ clientConfig.setProperty(ClientProperty.INSTANCE_NAME, getZooKeeperInstanceName());
|
||||
+ }
|
||||
+ if (zooKeeperHosts != null && !getZooKeeperHosts().isEmpty()) {
|
||||
+ clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, getZooKeeperHosts());
|
||||
+ }
|
||||
// Automatically try to add in the proper ZK from accumulo-site for backwards compat.
|
||||
if (!clientConfig.containsKey(ClientProperty.INSTANCE_ZK_HOST.getKey())) {
|
||||
AccumuloConfiguration siteConf = SiteConfiguration.getInstance(ServerConfigurationUtil.convertClientConfig(DefaultConfiguration.getInstance(),
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
657005739bdcc4bed717fd4398e9f5df accumulo-1.6.6-src.tar.gz
|
||||
Loading…
Add table
Add a link
Reference in a new issue