ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mgerg...@apache.org
Subject ambari git commit: AMBARI-22075. Use symlinks for Solr Data Manager (mgergely)
Date Wed, 27 Sep 2017 19:18:36 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 4da28dfff -> 9b259142f


AMBARI-22075. Use symlinks for Solr Data Manager (mgergely)

Change-Id: Ibe5a0df15f3a8fe378734f5899a8f17bba6127ca


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9b259142
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9b259142
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9b259142

Branch: refs/heads/trunk
Commit: 9b259142f47d1ebe55e26fbfdb0494cb825f8b2c
Parents: 4da28df
Author: Miklos Gergely <mgergely@hortonworks.com>
Authored: Wed Sep 27 19:56:09 2017 +0200
Committer: Miklos Gergely <mgergely@hortonworks.com>
Committed: Wed Sep 27 21:18:03 2017 +0200

----------------------------------------------------------------------
 .../src/main/package/deb/solr-client/postinst                  | 6 +++++-
 .../src/main/package/rpm/solr-client/postinstall.sh            | 6 +++++-
 ambari-infra/ambari-infra-solr-client/build.xml                | 3 +++
 .../src/main/python/solrDataManager.py                         | 0
 4 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b259142/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 c339cd0..ccc377b 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
@@ -20,5 +20,9 @@ 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"
 
+SOLR_DATA_MANAGER_LINK_NAME="/usr/bin/infra-solr-data-manager"
+SOLR_DATA_MANAGER_SOURCE="/usr/lib/ambari-infra-solr-client/solrDataManager.py"
+
 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
+rm -f $SOLR_INDEX_TOOL_LINK_NAME ; ln -s $SOLR_INDEX_TOOL_SOURCE $SOLR_INDEX_TOOL_LINK_NAME
+rm -f $SOLR_DATA_MANAGER_LINK_NAME ; ln -s $SOLR_DATA_MANAGER_SOURCE $SOLR_DATA_MANAGER_LINK_NAME
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b259142/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
index c339cd0..ccc377b 100644
--- 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
@@ -20,5 +20,9 @@ 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"
 
+SOLR_DATA_MANAGER_LINK_NAME="/usr/bin/infra-solr-data-manager"
+SOLR_DATA_MANAGER_SOURCE="/usr/lib/ambari-infra-solr-client/solrDataManager.py"
+
 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
+rm -f $SOLR_INDEX_TOOL_LINK_NAME ; ln -s $SOLR_INDEX_TOOL_SOURCE $SOLR_INDEX_TOOL_LINK_NAME
+rm -f $SOLR_DATA_MANAGER_LINK_NAME ; ln -s $SOLR_DATA_MANAGER_SOURCE $SOLR_DATA_MANAGER_LINK_NAME
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b259142/ambari-infra/ambari-infra-solr-client/build.xml
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-solr-client/build.xml b/ambari-infra/ambari-infra-solr-client/build.xml
index 25ff0cb..d9d3a6c 100644
--- a/ambari-infra/ambari-infra-solr-client/build.xml
+++ b/ambari-infra/ambari-infra-solr-client/build.xml
@@ -42,12 +42,15 @@
       <fileset file="src/main/resources/log4j.properties"/>
     </copy>
     <chmod file="target/package/*.sh" perm="755"/>
+    <chmod file="target/package/*.py" perm="755"/>
     <tar compression="gzip" destfile="target/ambari-infra-solr-client.tar.gz">
       <tarfileset mode="755" dir="target/package">
         <include name="*.sh"/>
+        <include name="*.py"/>
       </tarfileset>
       <tarfileset mode="664" dir="target/package">
         <exclude name="*.sh"/>
+        <exclude name="*.py"/>
       </tarfileset>
     </tar>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b259142/ambari-infra/ambari-infra-solr-client/src/main/python/solrDataManager.py
----------------------------------------------------------------------
diff --git a/ambari-infra/ambari-infra-solr-client/src/main/python/solrDataManager.py b/ambari-infra/ambari-infra-solr-client/src/main/python/solrDataManager.py
old mode 100644
new mode 100755


Mime
View raw message