You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2017/09/27 09:26:42 UTC
[2/2] ambari git commit: AMBARI-22059. Use symlinks for Infra
components (oleewere)
AMBARI-22059. Use symlinks for Infra components (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6fb05cb0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6fb05cb0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6fb05cb0
Branch: refs/heads/trunk
Commit: 6fb05cb0f089ef0fee7fcc462efda967b814b668
Parents: 9d802b7
Author: Oliver Szabo <ol...@gmail.com>
Authored: Tue Sep 26 13:49:16 2017 +0200
Committer: Oliver Szabo <ol...@gmail.com>
Committed: Wed Sep 27 11:26:23 2017 +0200
----------------------------------------------------------------------
ambari-infra/ambari-infra-assembly/pom.xml | 8 +++++++
.../src/main/package/deb/manager/postinst | 5 ++++
.../src/main/package/deb/solr-client/postinst | 9 ++++++++
.../src/main/package/rpm/manager/postinstall.sh | 20 ++++++++++++++++
.../main/package/rpm/solr-client/postinstall.sh | 24 ++++++++++++++++++++
.../src/main/resources/infraManager.sh | 10 +++++++-
.../src/main/resources/solrIndexHelper.sh | 5 ++--
7 files changed, 78 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb05cb0/ambari-infra/ambari-infra-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-assembly/pom.xml b/ambari-infra/ambari-infra-assembly/pom.xml
index fafef7e..dfb5c01 100644
--- a/ambari-infra/ambari-infra-assembly/pom.xml
+++ b/ambari-infra/ambari-infra-assembly/pom.xml
@@ -110,6 +110,10 @@
<name>${solr.client.package.name}</name>
<needarch>noarch</needarch>
<targetOS>linux</targetOS>
+ <postinstallScriptlet>
+ <scriptFile>${project.basedir}/src/main/package/rpm/solr-client/postinstall.sh</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </postinstallScriptlet>
<mappings>
<mapping>
<directory>${solr.client.mapping.path}</directory>
@@ -131,6 +135,10 @@
<configuration>
<group>Development</group>
<name>${infra-manager.package.name}</name>
+ <postinstallScriptlet>
+ <scriptFile>${project.basedir}/src/main/package/rpm/manager/postinstall.sh</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </postinstallScriptlet>
<mappings>
<mapping>
<directory>${infra-manager.mapping.path}</directory>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb05cb0/ambari-infra/ambari-infra-assembly/src/main/package/deb/manager/postinst
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-assembly/src/main/package/deb/manager/postinst b/ambari-infra/ambari-infra-assembly/src/main/package/deb/manager/postinst
index 21a01fa..c8d6ecd 100644
--- a/ambari-infra/ambari-infra-assembly/src/main/package/deb/manager/postinst
+++ b/ambari-infra/ambari-infra-assembly/src/main/package/deb/manager/postinst
@@ -13,3 +13,8 @@
# 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
+
+INFRA_MANAGER_LINK_NAME="/usr/bin/infra-manager"
+INFRA_MANAGER_SOURCE="/usr/lib/ambari-infra-manager/infraManager.sh"
+
+rm -f $INFRA_MANAGER_LINK_NAME ; ln -s $INFRA_MANAGER_SOURCE $INFRA_MANAGER_LINK_NAME
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb05cb0/ambari-infra/ambari-infra-assembly/src/main/package/deb/solr-client/postinst
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-assembly/src/main/package/deb/solr-client/postinst b/ambari-infra/ambari-infra-assembly/src/main/package/deb/solr-client/postinst
index 21a01fa..c339cd0 100644
--- a/ambari-infra/ambari-infra-assembly/src/main/package/deb/solr-client/postinst
+++ b/ambari-infra/ambari-infra-assembly/src/main/package/deb/solr-client/postinst
@@ -13,3 +13,12 @@
# 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
+
+SOLR_CLOUD_CLI_LINK_NAME="/usr/bin/infra-solr-cloud-cli"
+SOLR_CLOUD_CLI_SOURCE="/usr/lib/ambari-infra-solr-client/solrCloudCli.sh"
+
+SOLR_INDEX_TOOL_LINK_NAME="/usr/bin/infra-lucene-index-tool"
+SOLR_INDEX_TOOL_SOURCE="/usr/lib/ambari-infra-solr-client/solrIndexHelper.sh"
+
+rm -f $SOLR_CLOUD_CLI_LINK_NAME ; ln -s $SOLR_CLOUD_CLI_SOURCE $SOLR_CLOUD_CLI_LINK_NAME
+rm -f $SOLR_INDEX_TOOL_LINK_NAME ; ln -s $SOLR_INDEX_TOOL_SOURCE $SOLR_INDEX_TOOL_LINK_NAME
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb05cb0/ambari-infra/ambari-infra-assembly/src/main/package/rpm/manager/postinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-assembly/src/main/package/rpm/manager/postinstall.sh b/ambari-infra/ambari-infra-assembly/src/main/package/rpm/manager/postinstall.sh
new file mode 100644
index 0000000..48a3998
--- /dev/null
+++ b/ambari-infra/ambari-infra-assembly/src/main/package/rpm/manager/postinstall.sh
@@ -0,0 +1,20 @@
+#!/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
+
+INFRA_MANAGER_LINK_NAME="/usr/bin/infra-manager"
+INFRA_MANAGER_SOURCE="/usr/lib/ambari-infra-manager/infraManager.sh"
+
+rm -f $INFRA_MANAGER_LINK_NAME ; ln -s $INFRA_MANAGER_SOURCE $INFRA_MANAGER_LINK_NAME
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb05cb0/ambari-infra/ambari-infra-assembly/src/main/package/rpm/solr-client/postinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-assembly/src/main/package/rpm/solr-client/postinstall.sh b/ambari-infra/ambari-infra-assembly/src/main/package/rpm/solr-client/postinstall.sh
new file mode 100644
index 0000000..c339cd0
--- /dev/null
+++ b/ambari-infra/ambari-infra-assembly/src/main/package/rpm/solr-client/postinstall.sh
@@ -0,0 +1,24 @@
+#!/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
+
+SOLR_CLOUD_CLI_LINK_NAME="/usr/bin/infra-solr-cloud-cli"
+SOLR_CLOUD_CLI_SOURCE="/usr/lib/ambari-infra-solr-client/solrCloudCli.sh"
+
+SOLR_INDEX_TOOL_LINK_NAME="/usr/bin/infra-lucene-index-tool"
+SOLR_INDEX_TOOL_SOURCE="/usr/lib/ambari-infra-solr-client/solrIndexHelper.sh"
+
+rm -f $SOLR_CLOUD_CLI_LINK_NAME ; ln -s $SOLR_CLOUD_CLI_SOURCE $SOLR_CLOUD_CLI_LINK_NAME
+rm -f $SOLR_INDEX_TOOL_LINK_NAME ; ln -s $SOLR_INDEX_TOOL_SOURCE $SOLR_INDEX_TOOL_LINK_NAME
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb05cb0/ambari-infra/ambari-infra-manager/src/main/resources/infraManager.sh
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-manager/src/main/resources/infraManager.sh b/ambari-infra/ambari-infra-manager/src/main/resources/infraManager.sh
index 65287b2..bbf03df 100644
--- a/ambari-infra/ambari-infra-manager/src/main/resources/infraManager.sh
+++ b/ambari-infra/ambari-infra-manager/src/main/resources/infraManager.sh
@@ -14,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+: ${JAVA_HOME:?"Please set the JAVA_HOME variable!"}
+
JVM="java"
sdir="`dirname \"$0\"`"
+ldir="`dirname "$(readlink -f "$0")"`"
+
+DIR="$sdir"
+if [ "$sdir" != "$ldir" ]; then
+ DIR="$ldir"
+fi
-PATH=$JAVA_HOME/bin:$PATH nohup $JVM -classpath "/etc/ambari-infra-manager/conf:$sdir:$sdir/libs/*" $INFRA_MANAGER_OPTS org.apache.ambari.infra.InfraManager ${1+"$@"} &
\ No newline at end of file
+PATH=$JAVA_HOME/bin:$PATH nohup $JVM -classpath "/etc/ambari-infra-manager/conf:$DIR:$DIR/libs/*" $INFRA_MANAGER_OPTS org.apache.ambari.infra.InfraManager ${1+"$@"} &
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb05cb0/ambari-infra/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh b/ambari-infra/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh
index 1d219d6..6e817ec 100755
--- a/ambari-infra/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh
+++ b/ambari-infra/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+: ${JAVA_HOME:?"Please set the JAVA_HOME variable!"}
+
JVM="java"
sdir="`dirname \"$0\"`"
ldir="`dirname "$(readlink -f "$0")"`"
@@ -22,12 +24,11 @@ DIR="$sdir"
if [ "$sdir" != "$ldir" ]; then
DIR="$ldir"
fi
-: ${JAVA_HOME:?"Please set the JAVA_HOME for lucene index migration!"}
function print_help() {
cat << EOF
- Usage: solrIndexHelper.sh [<command>] [<arguments with flags>]
+ Usage: [<command>] [<arguments with flags>]
commands:
upgrade-index Check and upgrade solr index data in core directories.