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 2018/01/15 20:31:13 UTC
[ambari] branch trunk updated: AMBARI-22789. Fix Log Search / Log
Feeder / Infra Manager start scripts
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 79704f5 AMBARI-22789. Fix Log Search / Log Feeder / Infra Manager start scripts
79704f5 is described below
commit 79704f5f948e738a01965959e6be171506be85f8
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Mon Jan 15 17:21:55 2018 +0100
AMBARI-22789. Fix Log Search / Log Feeder / Infra Manager start scripts
---
.../ambari-infra-manager/src/main/resources/infraManager.sh | 12 ++++++------
.../ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh | 12 ++++++------
.../ambari-logsearch-server/src/main/scripts/logsearch.sh | 12 ++++++------
.../LOGSEARCH/0.5.0/package/scripts/logfeeder.py | 4 ++--
.../src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py | 2 +-
5 files changed, 21 insertions(+), 21 deletions(-)
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 0e3e749..5ac32e3 100644
--- a/ambari-infra/ambari-infra-manager/src/main/resources/infraManager.sh
+++ b/ambari-infra/ambari-infra-manager/src/main/resources/infraManager.sh
@@ -14,12 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-JVM="java"
-
-if [ -x $JAVA_HOME/bin/java ]; then
- JVM=$JAVA_HOME/bin/java
-fi
-
if [ "$INFRA_MANAGER_JAVA_MEM" = "" ]; then
INFRA_MANAGER_JAVA_MEM="-Xmx1g"
fi
@@ -48,6 +42,12 @@ if [ -f "$INFRA_MANAGER_CONF_DIR/infra-manager-env.sh" ]; then
source $INFRA_MANAGER_CONF_DIR/infra-manager-env.sh
fi
+JVM="java"
+
+if [ -x $JAVA_HOME/bin/java ]; then
+ JVM=$JAVA_HOME/bin/java
+fi
+
if [ ! -z "$INFRA_MANAGER_SOLR_CLIENT_SSL_INCLUDE" ]; then
source $INFRA_MANAGER_SOLR_CLIENT_SSL_INCLUDE
fi
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
index 5f4edea..2d8e229 100755
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
@@ -14,12 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-JVM="java"
-
-if [ -x $JAVA_HOME/bin/java ]; then
- JVM=$JAVA_HOME/bin/java
-fi
-
if [ "$LOGFEEDER_JAVA_MEM" = "" ]; then
LOGFEEDER_JAVA_MEM="-Xmx512m"
fi
@@ -51,6 +45,12 @@ if [ -f "$LOGFEEDER_CONF_DIR/logfeeder-env.sh" ]; then
source $LOGFEEDER_CONF_DIR/logfeeder-env.sh
fi
+JVM="java"
+
+if [ -x $JAVA_HOME/bin/java ]; then
+ JVM=$JAVA_HOME/bin/java
+fi
+
if [ ! -z "$LOGSEARCH_SOLR_CLIENT_SSL_INCLUDE" ]; then
source $LOGSEARCH_SOLR_CLIENT_SSL_INCLUDE
fi
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh b/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
index 8439065..25e8b09 100755
--- a/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
@@ -14,12 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-JVM="java"
-
-if [ -x $JAVA_HOME/bin/java ]; then
- JVM=$JAVA_HOME/bin/java
-fi
-
if [ "$LOGSEARCH_JAVA_MEM" = "" ]; then
LOGSEARCH_JAVA_MEM="-Xmx1g"
fi
@@ -49,6 +43,12 @@ if [ -f "$LOGSEARCH_CONF_DIR/logsearch-env.sh" ]; then
source $LOGSEARCH_CONF_DIR/logsearch-env.sh
fi
+JVM="java"
+
+if [ -x $JAVA_HOME/bin/java ]; then
+ JVM=$JAVA_HOME/bin/java
+fi
+
if [ ! -z "$LOGSEARCH_SOLR_CLIENT_SSL_INCLUDE" ]; then
source $LOGSEARCH_SOLR_CLIENT_SSL_INCLUDE
fi
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py
index 2f6c13c..2aa8b66 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py
@@ -42,14 +42,14 @@ class LogFeeder(Script):
env.set_params(params)
self.configure(env)
- Execute((format('{logfeeder_dir}/bin/logfeeder.sh start'),),
+ Execute((format('{logfeeder_dir}/bin/logfeeder.sh'), "start"),
sudo=True)
def stop(self, env, upgrade_type=None):
import params
env.set_params(params)
- Execute((format('{logfeeder_dir}/bin/logfeeder.sh stop'),),
+ Execute((format('{logfeeder_dir}/bin/logfeeder.sh'), "stop"),
sudo=True)
def status(self, env):
diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py
index 13774f7..3bc48ac 100644
--- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py
+++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py
@@ -127,6 +127,6 @@ class TestLogFeeder(RMFTestCase):
)
self.configureResourcesCalled()
- self.assertResourceCalled('Execute', ('/usr/lib/ambari-logsearch-logfeeder/bin/logfeeder.sh start',),
+ self.assertResourceCalled('Execute', ('/usr/lib/ambari-logsearch-logfeeder/bin/logfeeder.sh', "start"),
sudo=True
)
--
To stop receiving notification emails like this one, please contact
['"commits@ambari.apache.org" <co...@ambari.apache.org>'].