Repository: accumulo Updated Branches: refs/heads/1.7 a4bc71b4d -> 071c5071f refs/heads/master 8f52ab250 -> 04e91398b
ACCUMULO-4030 Support for IBM IOP in configs (Jerry He). Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43df0cfe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43df0cfe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43df0cfe Branch: refs/heads/1.7 Commit: 43df0cfe18bad8862be95f8246a0ffd9d50093c8 Parents: a4bc71b Author: Josh Elser <els...@apache.org> Authored: Sat Oct 24 16:58:06 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sat Oct 24 16:58:06 2015 -0400 ---------------------------------------------------------------------- assemble/bin/bootstrap_config.sh | 29 +++++++++++++++++++++++++- assemble/conf/templates/accumulo-site.xml | 9 ++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/43df0cfe/assemble/bin/bootstrap_config.sh ---------------------------------------------------------------------- diff --git a/assemble/bin/bootstrap_config.sh b/assemble/bin/bootstrap_config.sh index f6eb4d1..719aff9 100755 --- a/assemble/bin/bootstrap_config.sh +++ b/assemble/bin/bootstrap_config.sh @@ -237,13 +237,15 @@ fi if [[ -z "${HADOOP_VERSION}" ]]; then echo echo "Choose the Apache Hadoop version:" - select HADOOP in 'Hadoop 2' 'HDP 2.0/2.1' 'HDP 2.2' ; do + select HADOOP in 'Hadoop 2' 'HDP 2.0/2.1' 'HDP 2.2' 'IOP 4.1'; do if [ "${HADOOP}" == "Hadoop 2" ]; then HADOOP_VERSION="2" elif [ "${HADOOP}" == "HDP 2.0/2.1" ]; then HADOOP_VERSION="HDP2" elif [ "${HADOOP}" == "HDP 2.2" ]; then HADOOP_VERSION="HDP2.2" + elif [ "${HADOOP}" == "IOP 4.1" ]; then + HADOOP_VERSION="IOP4.1" fi echo "Using Hadoop version '${HADOOP_VERSION}' configuration" echo @@ -333,6 +335,10 @@ if [[ "${HADOOP_VERSION}" == "2" ]]; then -e 's/<!-- End HDP 2.2 requirements -->/--><!-- End HDP 2.2 requirements -->/' \ "${CONF_DIR}/$ACCUMULO_SITE" > temp mv temp "${CONF_DIR}/$ACCUMULO_SITE" + sed -e 's/<!-- IOP 4.1 requirements -->/<!-- IOP 4.1 requirements --><!--/' \ + -e 's/<!-- End IOP 4.1 requirements -->/--><!-- End IOP 4.1 requirements -->/' \ + "${CONF_DIR}/$ACCUMULO_SITE" > temp + mv temp "${CONF_DIR}/$ACCUMULO_SITE" elif [[ "${HADOOP_VERSION}" == "HDP2" ]]; then sed -e 's/<!-- Hadoop 2 requirements -->/<!-- Hadoop 2 requirements --><!--/' \ -e 's/<!-- End Hadoop 2 requirements -->/--><!-- End Hadoop 2 requirements -->/' \ @@ -342,6 +348,10 @@ elif [[ "${HADOOP_VERSION}" == "HDP2" ]]; then -e 's/<!-- End HDP 2.2 requirements -->/--><!-- End HDP 2.2 requirements -->/' \ "${CONF_DIR}/$ACCUMULO_SITE" > temp mv temp "${CONF_DIR}/$ACCUMULO_SITE" + sed -e 's/<!-- IOP 4.1 requirements -->/<!-- IOP 4.1 requirements --><!--/' \ + -e 's/<!-- End IOP 4.1 requirements -->/--><!-- End IOP 4.1 requirements -->/' \ + "${CONF_DIR}/$ACCUMULO_SITE" > temp + mv temp "${CONF_DIR}/$ACCUMULO_SITE" elif [[ "${HADOOP_VERSION}" == "HDP2.2" ]]; then sed -e 's/<!-- Hadoop 2 requirements -->/<!-- Hadoop 2 requirements --><!--/' \ -e 's/<!-- End Hadoop 2 requirements -->/--><!-- End Hadoop 2 requirements -->/' \ @@ -351,6 +361,23 @@ elif [[ "${HADOOP_VERSION}" == "HDP2.2" ]]; then -e 's/<!-- End HDP 2.0 requirements -->/--><!-- End HDP 2.0 requirements -->/' \ "${CONF_DIR}/$ACCUMULO_SITE" > temp mv temp "${CONF_DIR}/$ACCUMULO_SITE" + sed -e 's/<!-- IOP 4.1 requirements -->/<!-- IOP 4.1 requirements --><!--/' \ + -e 's/<!-- End IOP 4.1 requirements -->/--><!-- End IOP 4.1 requirements -->/' \ + "${CONF_DIR}/$ACCUMULO_SITE" > temp + mv temp "${CONF_DIR}/$ACCUMULO_SITE" +elif [[ "${HADOOP_VERSION}" == "IOP4.1" ]]; then + sed -e 's/<!-- Hadoop 2 requirements -->/<!-- Hadoop 2 requirements --><!--/' \ + -e 's/<!-- End Hadoop 2 requirements -->/--><!-- End Hadoop 2 requirements -->/' \ + "${CONF_DIR}/$ACCUMULO_SITE" > temp + mv temp "${CONF_DIR}/$ACCUMULO_SITE" + sed -e 's/<!-- HDP 2.0 requirements -->/<!-- HDP 2.0 requirements --><!--/' \ + -e 's/<!-- End HDP 2.0 requirements -->/--><!-- End HDP 2.0 requirements -->/' \ + "${CONF_DIR}/$ACCUMULO_SITE" > temp + mv temp "${CONF_DIR}/$ACCUMULO_SITE" + sed -e 's/<!-- HDP 2.2 requirements -->/<!-- HDP 2.2 requirements --><!--/' \ + -e 's/<!-- End HDP 2.2 requirements -->/--><!-- End HDP 2.2 requirements -->/' \ + "${CONF_DIR}/$ACCUMULO_SITE" > temp + mv temp "${CONF_DIR}/$ACCUMULO_SITE" fi #Additional setup steps for native configuration. http://git-wip-us.apache.org/repos/asf/accumulo/blob/43df0cfe/assemble/conf/templates/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/assemble/conf/templates/accumulo-site.xml b/assemble/conf/templates/accumulo-site.xml index 0e4f016..eaaf2b6 100644 --- a/assemble/conf/templates/accumulo-site.xml +++ b/assemble/conf/templates/accumulo-site.xml @@ -170,6 +170,15 @@ ${mvnProjBaseDir} /usr/hdp/current/hadoop-yarn-client/lib/jersey.*.jar, /usr/hdp/current/hive-client/lib/hive-accumulo-handler.jar <!-- End HDP 2.2 requirements --> + <!-- IOP 4.1 requirements --> + /usr/iop/current/hadoop-client/[^.].*.jar, + /usr/iop/current/hadoop-client/lib/(?!slf4j)[^.].*.jar, + /usr/iop/current/hadoop-hdfs-client/[^.].*.jar, + /usr/iop/current/hadoop-mapreduce-client/[^.].*.jar, + /usr/iop/current/hadoop-yarn-client/[^.].*.jar, + /usr/iop/current/hadoop-yarn-client/lib/jersey.*.jar, + /usr/iop/current/hive-client/lib/hive-accumulo-handler.jar + <!-- End IOP 4.1 requirements --> </value> <description>Classpaths that accumulo checks for updates and class files.</description> </property>
