Repository: ambari Updated Branches: refs/heads/trunk 17990ba26 -> d82625e4e
AMBARI-6171. Ambari server is not starting after upgrade. (Iryna Kuzmenko via swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d82625e4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d82625e4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d82625e4 Branch: refs/heads/trunk Commit: d82625e4e55894b59b9f2de0a2fbef03277ff3c6 Parents: 17990ba Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Tue Jun 17 14:15:04 2014 -0700 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Tue Jun 17 14:19:02 2014 -0700 ---------------------------------------------------------------------- ambari-agent/pom.xml | 4 ++++ ambari-agent/src/main/package/rpm/posttrans.sh | 19 +++++++++++++++++++ ambari-server/conf/unix/install-helper.sh | 1 - ambari-server/pom.xml | 4 ++++ ambari-server/src/main/package/rpm/posttrans.sh | 19 +++++++++++++++++++ 5 files changed, 46 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d82625e4/ambari-agent/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml index da88261..3592101 100644 --- a/ambari-agent/pom.xml +++ b/ambari-agent/pom.xml @@ -198,6 +198,10 @@ <scriptFile>src/main/package/rpm/preremove.sh</scriptFile> <fileEncoding>utf-8</fileEncoding> </preremoveScriptlet> + <posttransScriptlet> + <scriptFile>src/main/package/rpm/posttrans.sh</scriptFile> + <fileEncoding>utf-8</fileEncoding> + </posttransScriptlet> <needarch>x86_64</needarch> <autoRequires>false</autoRequires> http://git-wip-us.apache.org/repos/asf/ambari/blob/d82625e4/ambari-agent/src/main/package/rpm/posttrans.sh ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/package/rpm/posttrans.sh b/ambari-agent/src/main/package/rpm/posttrans.sh new file mode 100644 index 0000000..b3e2240 --- /dev/null +++ b/ambari-agent/src/main/package/rpm/posttrans.sh @@ -0,0 +1,19 @@ +# 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 + +COMMON_DIR="/usr/lib/python2.6/site-packages/common_functions" +COMMON_DIR_SERVER="/usr/lib/ambari-server/lib/common_functions" + +ln -s "$COMMON_DIR_SERVER" "$COMMON_DIR" http://git-wip-us.apache.org/repos/asf/ambari/blob/d82625e4/ambari-server/conf/unix/install-helper.sh ---------------------------------------------------------------------- diff --git a/ambari-server/conf/unix/install-helper.sh b/ambari-server/conf/unix/install-helper.sh index db292ad..7b23b59 100644 --- a/ambari-server/conf/unix/install-helper.sh +++ b/ambari-server/conf/unix/install-helper.sh @@ -27,7 +27,6 @@ PYTHON_WRAPER_SOURCE="/var/lib/ambari-server/ambari-python-wrap" do_install(){ # setting common_functions shared resource rm -rf "$COMMON_DIR" - ln -s "$COMMON_DIR_SERVER" "$COMMON_DIR" # setting python-wrapper script if [ ! -f "$PYTHON_WRAPER_TARGET" ]; then ln -s "$PYTHON_WRAPER_SOURCE" "$PYTHON_WRAPER_TARGET" http://git-wip-us.apache.org/repos/asf/ambari/blob/d82625e4/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 3773cde..96d250f 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -221,6 +221,10 @@ <scriptFile>src/main/package/rpm/preremove.sh</scriptFile> <fileEncoding>utf-8</fileEncoding> </preremoveScriptlet> + <posttransScriptlet> + <scriptFile>src/main/package/rpm/posttrans.sh</scriptFile> + <fileEncoding>utf-8</fileEncoding> + </posttransScriptlet> <defaultFilemode>644</defaultFilemode> <defaultDirmode>755</defaultDirmode> <defaultUsername>root</defaultUsername> http://git-wip-us.apache.org/repos/asf/ambari/blob/d82625e4/ambari-server/src/main/package/rpm/posttrans.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/package/rpm/posttrans.sh b/ambari-server/src/main/package/rpm/posttrans.sh new file mode 100644 index 0000000..b3e2240 --- /dev/null +++ b/ambari-server/src/main/package/rpm/posttrans.sh @@ -0,0 +1,19 @@ +# 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 + +COMMON_DIR="/usr/lib/python2.6/site-packages/common_functions" +COMMON_DIR_SERVER="/usr/lib/ambari-server/lib/common_functions" + +ln -s "$COMMON_DIR_SERVER" "$COMMON_DIR"
