This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 81a2258 PHOENIX-6131 Remove Omid and Tephra daemon components from
Phoenix assembly
81a2258 is described below
commit 81a2258467f637148d3a641202bbcb6cf45bad1d
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Sep 14 07:37:54 2020 +0200
PHOENIX-6131 Remove Omid and Tephra daemon components from Phoenix assembly
also remove some conflicting explicit versions from assembly
---
bin/omid-env.sh | 43 ---
bin/omid-server-configuration.yml | 178 ------------
bin/omid.sh | 90 ------
bin/tephra | 310 ---------------------
bin/tephra-env.sh | 55 ----
phoenix-assembly/pom.xml | 12 +-
.../build/components/all-common-dependencies.xml | 11 -
7 files changed, 1 insertion(+), 698 deletions(-)
diff --git a/bin/omid-env.sh b/bin/omid-env.sh
deleted file mode 100644
index 820cdaa..0000000
--- a/bin/omid-env.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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.
-#
-
-# Set the flags to pass to the jvm when running omid
-# export JVM_FLAGS=-Xmx8096m
-#
---------------------------------------------------------------------------------------------------------------------
-# Check if HADOOP_CONF_DIR and HBASE_CONF_DIR are set
-#
---------------------------------------------------------------------------------------------------------------------
-export JVM_FLAGS=-Xmx4096m
-if [ -z ${HADOOP_CONF_DIR+x} ]; then
- if [ -z ${HADOOP_HOME+x} ]; then
- echo "WARNING: HADOOP_HOME or HADOOP_CONF_DIR are unset";
- else
- export HADOOP_CONF_DIR=${HADOOP_HOME}/conf
- fi
-else
- echo "HADOOP_CONF_DIR is set to '$HADOOP_CONF_DIR'";
-fi
-
-if [ -z ${HBASE_CONF_DIR+x} ]; then
- if [ -z ${HBASE_HOME+x} ]; then
- echo "WARNING: HBASE_HOME or HBASE_CONF_DIR are unset";
- else
- export HBASE_CONF_DIR=${HBASE_HOME}/conf
- fi
-else
- echo "HBASE_CONF_DIR is set to '$HBASE_CONF_DIR'";
-fi
diff --git a/bin/omid-server-configuration.yml
b/bin/omid-server-configuration.yml
deleted file mode 100644
index 82577b2..0000000
--- a/bin/omid-server-configuration.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-# 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.
-#
-#
=====================================================================================================================
-#
-# Omid TSO Server Configuration
-#
---------------------------------------------------------------------------------------------------------------------
-#
-# Tune here the default values for TSO server config parameters found in
'default-omid-server-configuration.yml' file
-#
-#
=====================================================================================================================
-
-
-#
---------------------------------------------------------------------------------------------------------------------
-# Basic configuration parameters
-#
---------------------------------------------------------------------------------------------------------------------
-
-# Network interface for TSO server communication. Uncomment the following line
to use a specific interface
-# networkIfaceName: eth0
-# If a network interface in the configuration, the TSO will attempt to guess
default network interface.
-# See org.apache.omid.tso.TSOServerConfig.getDefaultNetworkInterface for more
information.
-
-# Port reserved by the Status Oracle
-port: 54758
-# Wait strategy for the Disruptor processors in TSO pipeline. Options:
-# 1) HIGH_THROUGHPUT - [Default] Use this in production deployments for
maximum performance
-# 2) LOW_CPU - Use this option when testing or in deployments where saving CPU
cycles is more important than throughput
-waitStrategy: LOW_CPU
-# The number of elements reserved in the conflict map to perform conflict
resolution
-conflictMapSize: 100000000
-# The number of Commit Table writers that persist data concurrently to the
datastore. It has to be at least 2.
-numConcurrentCTWriters: 2
-# The size of the batch of operations that each Commit Table writes has. The
maximum number of operations that can be
-# batched in the system at a certain point in time is: numConcurrentCTWriters
* batchSizePerCTWriter
-batchSizePerCTWriter: 25
-# When this timeout expires, the contents of the batch are flushed to the
datastore
-batchPersistTimeoutInMs: 10
-# Timestamp generation strategy
-# INCREMENTAL - [Default] regular counter
-# WORLD_TIME - world time based counter
-timestampType: WORLD_TIME
-lowLatency: false
-# Default module configuration (No TSO High Availability & in-memory storage
for timestamp and commit tables)
-timestampStoreModule:
!!org.apache.omid.timestamp.storage.HBaseTimestampStorageModule [ ]
-commitTableStoreModule:
!!org.apache.omid.committable.hbase.HBaseCommitTableStorageModule [ ]
-
-leaseModule: !!org.apache.omid.tso.VoidLeaseManagementModule [ ]
-
-# Default stats/metrics configuration
-metrics: !!org.apache.omid.metrics.NullMetricsProvider [ ]
-
-monitorContext: false
-
-#
---------------------------------------------------------------------------------------------------------------------
-# Timestamp storage configuration options
-#
---------------------------------------------------------------------------------------------------------------------
-# Could be any guava module that binds
org.apache.omid.timestamp.storage.TimestampStorage
-# Current available Timestamp stores:
-# org.apache.omid.tso.InMemoryTimestampStorageModule
-# org.apache.omid.timestamp.storage.HBaseTimestampStorageModule
-# org.apache.omid.timestamp.storage.ZKTimestampStorageModule
-
-#
---------------------------------------------------------------------------------------------------------------------
-# Commit Table storage configuration options
-#
---------------------------------------------------------------------------------------------------------------------
-# Could be any guava module that binds org.apache.omid.committable.CommitTable
-# Available CommitTable stores:
-# org.apache.omid.committable.hbase.HBaseCommitTableStorageModule
-# org.apache.omid.tso.InMemoryCommitTableStorageModule
-
-#
---------------------------------------------------------------------------------------------------------------------
-# Metrics configuration options
-#
---------------------------------------------------------------------------------------------------------------------
-# Metrics could be anything that is org.apache.omid.metrics.MetricsRegistry
-# There are 4 built-in reporters: CSV, SLF4J, GRAPHITE, CONSOLE
-# Please see org.apache.omid.metrics.CodahaleMetricsConfig for details.
-
-# Example configuration for reporting statistics to the console every minute:
-#
-# metrics: !!org.apache.omid.metrics.CodahaleMetricsProvider [
-# !!org.apache.omid.metrics.CodahaleMetricsConfig {
-# outputFreqInSecs: 60,
-# reporters: !!set {
-# !!org.apache.omid.metrics.CodahaleMetricsConfig$Reporter CONSOLE
-# },
-# }
-# ]
-
-# Example of multiple reporter configuration (to CSV files and console)
-#
-# metrics: !!org.apache.omid.metrics.CodahaleMetricsProvider [
-# !!org.apache.omid.metrics.CodahaleMetricsConfig {
-# outputFreqInSecs: 60,
-# reporters: !!set {
-# !!org.apache.omid.metrics.CodahaleMetricsConfig$Reporter CSV,
-# !!org.apache.omid.metrics.CodahaleMetricsConfig$Reporter CONSOLE
-# },
-# csvDir: "csvMetrics",
-# prefix: "somePrefix",
-# }
-# ]
-
-#
=====================================================================================================================
-# Some example configurations
-#
=====================================================================================================================
-
-#
---------------------------------------------------------------------------------------------------------------------
-# Configuration WITHOUT High Availability using HBase for all required storage
& reporting metrics to CSV files
-#
---------------------------------------------------------------------------------------------------------------------
-#
-# commitTableStoreModule:
!!org.apache.omid.tso.DefaultHBaseCommitTableStorageModule [ ]
-# See optional params
-# - tableName
-# - familyName
-# - principal
-# - keytab
-# timestampStoreModule:
!!org.apache.omid.tso.DefaultHBaseTimestampStorageModule [ ]
-# See optional params
-# - tableName
-# - familyName
-# - principal
-# - keytab
-# leaseModule: !!org.apache.omid.tso.VoidLeaseManagementModule [ ]
-# metrics: !!org.apache.omid.metrics.CodahaleMetricsProvider [
-# !!org.apache.omid.metrics.CodahaleMetricsConfig {
-# reporters: !!set {
-# !!org.apache.omid.metrics.CodahaleMetricsConfig$Reporter CSV
-# },
-# csvDir: "myCSVMetricsDir",
-# prefix: "myAppPrefixForMetrics",
-# }
-# ]
-
-#
---------------------------------------------------------------------------------------------------------------------
-# Configuration WITHOUT High Availability using ZK to store the timestamps &
reporting metrics to console every 30 secs
-#
---------------------------------------------------------------------------------------------------------------------
-#
-# commitTableStoreModule:
!!org.apache.omid.tso.DefaultHBaseCommitTableStorageModule [ ]
-# timestampStoreModule: !!org.apache.omid.tso.DefaultZKTimestampStorageModule
-# zkCluster: "localhost:2181"
-# namespace: "omid"
-# leaseModule: !!org.apache.omid.tso.VoidLeaseManagementModule [ ]
-# metrics: !!org.apache.omid.metrics.CodahaleMetricsProvider [
-# !!org.apache.omid.metrics.CodahaleMetricsConfig {
-# outputFreqInSecs: 30,
-# reporters: !!set {
-# !!org.apache.omid.metrics.CodahaleMetricsConfig$Reporter CONSOLE
-# },
-# }
-# ]
-
-
-#
---------------------------------------------------------------------------------------------------------------------
-# Configuration WITH High Availability using HBase for all required storage
and no metrics reports
-#
---------------------------------------------------------------------------------------------------------------------
-#
-# commitTableStoreModule:
!!org.apache.omid.tso.DefaultHBaseCommitTableStorageModule [ ]
-# timestampStoreModule:
!!org.apache.omid.tso.DefaultHBaseTimestampStorageModule [ ]
-# leaseModule: !!org.apache.omid.tso.HALeaseManagementModule
-# leasePeriodInMs: 10000
-# tsoLeasePath: "/tso-lease"
-# currentTsoPath: "/current-tso"
-# zkCluster: "localhost:2181"
-# zkNamespace: "omid"
-# metrics: !!org.apache.omid.metrics.NullMetricsProvider [ ]
diff --git a/bin/omid.sh b/bin/omid.sh
deleted file mode 100644
index 1ecd05d..0000000
--- a/bin/omid.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-SCRIPTDIR=`dirname $0`
-cd $SCRIPTDIR;
-
-# Load Omid environment variables
-source omid-env.sh
-
-# Configure classpath...
-CLASSPATH=./:../conf:${HBASE_CONF_DIR}:${HADOOP_CONF_DIR}
-
-# ...for source release and...
-for j in ../target/omid-tso*.jar; do
- CLASSPATH=$CLASSPATH:$j
-done
-
-# and for binary release
-for j in ../omid-tso*.jar; do
- CLASSPATH=$CLASSPATH:$j
-done
-for j in ../lib/*.jar; do
- CLASSPATH=$CLASSPATH:$j
-done
-
-tso() {
- exec java $JVM_FLAGS -cp $CLASSPATH org.apache.omid.tso.TSOServer $@
-}
-
-tsoRelauncher() {
- until ./omid.sh tso $@; do
- echo "TSO Server crashed with exit code $?. Re-launching..." >&2
- sleep 1
- done
-}
-
-createHBaseCommitTable() {
- java -cp $CLASSPATH org.apache.omid.tools.hbase.OmidTableManager
commit-table $@
-}
-
-createHBaseTimestampTable() {
- java -cp $CLASSPATH org.apache.omid.tools.hbase.OmidTableManager
timestamp-table $@
-}
-
-usage() {
- echo "Usage: omid.sh <command> <options>"
- echo "where <command> is one of:"
- echo " tso Starts The Status Oracle server
(TSO)"
- echo " tso-relauncher Starts The Status Oracle server
(TSO) re-launching it if the process exits"
- echo " create-hbase-commit-table Creates the hbase commit table."
- echo " create-hbase-timestamp-table Creates the hbase timestamp table."
-}
-
-
-COMMAND=$1
-shift
-
-if [ "$COMMAND" = "tso" ]; then
- echo "Running Omid TSO."
- tso $@;
-elif [ "$COMMAND" = "tso-relauncher" ]; then
- tsoRelauncher $@;
-elif [ "$COMMAND" = "create-hbase-commit-table" ]; then
- createHBaseCommitTable $@;
-elif [ "$COMMAND" = "create-hbase-timestamp-table" ]; then
- createHBaseTimestampTable $@;
-else
- createHBaseTimestampTable $@;
- createHBaseCommitTable $@;
- echo "Running Omid TSO."
- tso $@;
-fi
-
-
diff --git a/bin/tephra b/bin/tephra
deleted file mode 100755
index d77d33f..0000000
--- a/bin/tephra
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2014 Cask Data, Inc.
-#
-# Licensed 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.
-#
-
-# Source function library. used for "status" use case
-if [ -f "/etc/rc.d/init.d/functions" ]; then
- PLATFORM="RHEL"
- . /etc/rc.d/init.d/functions
-elif [ -f /lib/lsb/init-functions ] ; then
- PLATFORM="UBUNTU"
- . /lib/lsb/init-functions
-else
- PLATFORM="UNSUPPORTED"
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-bin=`dirname "${BASH_SOURCE-$0}"`
-bin=`cd "$bin"; pwd`
-lib="$bin"/../lib
-conf="$bin"/../conf
-script=`basename $0`
-
-# Resolve relative symlinks
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/.."
-APP_HOME="`pwd -P`"
-APP=`basename $0`
-
-# Load component common environment file too
-. $bin/tephra-env.sh
-
-pid=$PID_DIR/tephra-service-${IDENT_STRING}.pid
-
-# In other environment, the jars are expected to be in <HOME>/lib directory.
-# Load all the jar files. Not ideal, but we need to load only the things that
-# is needed by this script.
-if [ "$CLASSPATH" = "" ]; then
- CLASSPATH=${lib}/*
-else
- CLASSPATH=$CLASSPATH:${lib}/*
-fi
-
-# Load the configuration too.
-if [ -d "$conf" ]; then
- CLASSPATH=$CLASSPATH:"$conf"/
-fi
-
-# Set Log location
-if [ ! -e $LOG_DIR ]; then
- mkdir -p $LOG_DIR;
-fi
-export LOG_PREFIX="tephra-service-$IDENT_STRING-$HOSTNAME"
-export LOGFILE=$LOG_PREFIX.log
-loglog="${LOG_DIR}/${LOGFILE}"
-
-# set the classpath to include hadoop and hbase dependencies
-set_classpath()
-{
- COMP_HOME=$1
- if [ -n "$HBASE_HOME" ]; then
- HBASE_CP=`$HBASE_HOME/bin/hbase classpath`
- elif [ `which hbase` ]; then
- HBASE_CP=`hbase classpath`
- fi
-
- export HBASE_CP
-
- if [ -n "$HBASE_CP" ]; then
- CP=$COMP_HOME/phoenix-client/target/*:$HBASE_CP:$EXTRA_CLASSPATH
- else
- # assume Hadoop/HBase libs are included via EXTRA_CLASSPATH
- echo "WARN: could not find Hadoop and HBase libraries"
- CP=$COMP_HOME/phoenix-client/target/*:$EXTRA_CLASSPATH
- fi
-
- # Setup classpaths.
- if [ -n "$CLASSPATH" ]; then
- CLASSPATH=$CLASSPATH:$CP
- else
- CLASSPATH=$CP
- fi
-
- export CLASSPATH
-}
-
-# Attempts to find JAVA in few ways.
-set_java ()
-{
- # Determine the Java command to use to start the JVM.
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- export JAVA="$JAVA_HOME/jre/sh/java"
- else
- export JAVA="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVA" ] ; then
- echo "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation." >&2
- exit 1
- fi
- else
- export JAVA="java"
- which java >/dev/null 2>&1 || { echo "ERROR: JAVA_HOME is not set and no
'java' command could be found in your PATH.
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation." >&2 ; exit 1; }
- fi
-}
-
-# checks if there exists a PID that is already running. return 0 idempotently
-check_before_start()
-{
- if [ ! -d "$PID_DIR" ]; then
- mkdir -p "$PID_DIR"
- fi
- if [ -f $pid ]; then
- if kill -0 `cat $pid` > /dev/null 2>&1; then
- #echo "$APP $SERVICE running as process `cat $pid`. Stop it first."
- echo "$APP running as process `cat $pid`. Stop it first."
- exit 0
- fi
- fi
-}
-
-# Set Niceness
-if [ "$NICENESS" = "" ]; then
- export NICENESS=0
-fi
-
-start() {
- # Setup classpaths.
- set_classpath $APP_HOME
-
- # sets the JAVA variable.
- set_java
-
- check_before_start
-
- echo "`date` Starting $APP service on `hostname`"
- echo "`date` Starting $APP service on `hostname`" >> $loglog
- echo "`ulimit -a`" >> $loglog 2>&1
-
- export MAIN_CLASS="org.apache.tephra.TransactionServiceMain"
- echo "Running class $MAIN_CLASS"
- echo "Command: " "$JAVA" $OPTS -cp $CLASSPATH $JAVA_HEAPMAX $MAIN_CLASS
>>$loglog
- nohup nice -n $NICENESS "$JAVA" $OPTS -cp $CLASSPATH $JAVA_HEAPMAX
${MAIN_CLASS} </dev/null >>$loglog 2>&1 &
- echo $! >$pid
-}
-
-stop() {
- if [ -f $pid ]; then
- pidToKill=`cat $pid`
- # kill -0 == see if the PID exists
- if kill -0 $pidToKill > /dev/null 2>&1; then
- echo -n stopping $command
- echo "`date` Terminating $command" >> $loglog
- kill $pidToKill > /dev/null 2>&1
- while kill -0 $pidToKill > /dev/null 2>&1;
- do
- echo -n "."
- sleep 1;
- done
- rm $pid
- echo
- else
- retval=$?
- echo nothing to stop because kill -0 of pid $pidToKill failed with
status $retval
- fi
- rm -f $pid
- else
- echo nothing to stop because no pid file $pid
- fi
-}
-
-restart() {
- stop
- start
-}
-
-condrestart(){
- case "$PLATFORM" in
- "RHEL")
- rh_status > /dev/null 2>&1
- retval=$?
- ;;
- "UBUNTU")
- ub_status > /dev/null 2>&1
- retval=$?
- ;;
- "UNSUPPORTED")
- echo "condrestart is not supported on platform"
- exit 1
- ;;
- esac
-
- if [[ $retval -eq 0 ]]; then
- restart
- fi
-}
-
-rh_status() {
- echo "checking status"
- # call sourced status function
- status -p $pid
-}
-
-ub_status() {
- echo "checking status"
- # call sourced status function
- status_of_proc -p $pid "$0" "$APP"
-}
-
-# Executes a specific class' main method with the classpath and environment
setup
-run() {
- classname=$1
- shift
- if [ -z "$classname" ]; then
- echo "ERROR: No classname was given!"
- echo "Usage: $0 run <fully qualified classname> [arguments]"
- exit 1
- fi
- # Setup classpaths.
- set_classpath $APP_HOME
-
- # sets the JAVA variable.
- set_java
-
- echo "Running class $classname"
- "$JAVA" $OPTS -cp $CLASSPATH $JAVA_HEAPMAX $classname $@
-}
-
-case "$1" in
- start)
- $1
- ;;
-
- stop)
- $1
- ;;
-
- restart)
- $1
- ;;
-
- condrestart)
- $1
- ;;
-
- status)
- case "$PLATFORM" in
- "RHEL")
- rh_status
- ;;
- "UBUNTU")
- ub_status
- ;;
- "UNSUPPORTED")
- echo "status is not supported on platform"
- exit 1
- ;;
- esac
- ;;
-
- classpath)
- set_classpath $APP_HOME
- set_java
- echo $CLASSPATH
- ;;
-
- run)
- shift
- run $@
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart|status|run}"
- exit 1
- ;;
-
-
-esac
-exit $?
-
diff --git a/bin/tephra-env.sh b/bin/tephra-env.sh
deleted file mode 100644
index 6906b44..0000000
--- a/bin/tephra-env.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2014 Cask Data, Inc.
-#
-# Licensed 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.
-#
-
-#
-# Common environment settings for Tephra.
-# Uncomment the lines below, where needed, and modify to adapt to your
environment.
-#
-
-# A string representing this instance of the Tephra server. $USER by default.
-export IDENT_STRING=$USER
-
-# Where log files are stored. /var/log by default.
-export LOG_DIR=/tmp/tephra-$IDENT_STRING
-
-# The directory where pid files are stored. /var/run by default.
-export PID_DIR=/tmp
-
-# Add any extra classes to the classpath
-# export EXTRA_CLASSPATH
-
-# Set the JVM heap size
-# export JAVA_HEAPMAX=-Xmx2048m
-
-# Additional runtime options
-#
-# GC logging options.
-# Uncomment the following two lines, making any desired changes, to enable GC
logging output
-# export GC_LOG_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps
-Xloggc:server-gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=2
-XX:GCLogFileSize=50M"
-# export OPTS="$OPTS $GC_LOG_OPTS"
-#
-# JMX options.
-# Uncomment the following two lines, making any desired changes, to enable
remote JMX connectivity
-# export JMX_OPTS="-Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.port=13001"
-# export OPTS="$OPTS $JMX_OPTS"
-
-# Extra Java runtime options.
-# Below are what we set by default. May only work with SUN JVM.
-# For more on why as well as other possible settings,
-# see http://wiki.apache.org/hadoop/PerformanceTuning
-export OPTS="$OPTS -XX:+UseConcMarkSweepGC"
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 1b47fad..b42c5e9 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -165,11 +165,6 @@
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-hbase-compat-2.2.1</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-tools-hbase2.x</artifactId>
- <version>${omid.version}</version>
- </dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
@@ -186,37 +181,32 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-miscellaneous</artifactId>
- <version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-protobuf</artifactId>
- <version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-netty</artifactId>
- <version>2.1.0</version>
+ <version>${hbase.thirdparty.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.0</version>
</dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
- <version>4.0.0-incubating</version>
</dependency>
</dependencies>
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index af4a8ea..c571f87 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -55,17 +55,6 @@
<include>io.netty:netty</include>
<include>commons-codec:commons-codec</include>
- <!-- For omid TSO -->
- <include>org.apache.omid:omid-tso-server-hbase2.x</include>
- <include>org.apache.omid:omid-hbase-common-hbase2.x</include>
- <include>org.apache.omid:omid-hbase-tools-hbase2.x</include>
- <include>org.apache.omid:omid-common</include>
- <include>org.apache.omid:omid-metrics</include>
- <include>org.apache.omid:omid-timestamp-storage-hbase2.x</include>
- <include>org.apache.omid:omid-hbase-shims-hbase2.x</include>
- <include>org.apache.omid:omid-commit-table</include>
- <include>org.apache.omid:omid-codahale-metrics</include>
- <include>org.apache.omid:omid-hbase-commit-table-hbase2.x</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.apache.commons:commons-configuration2</include>
