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 8eb901f  AMBARI-23218. Remove delete custom command from Ambari Infra 
Solr stack. (#638)
8eb901f is described below

commit 8eb901f8540fdfdf4dcd65b0039c3fae4afe75cc
Author: Olivér Szabó <oleew...@gmail.com>
AuthorDate: Tue Mar 13 15:20:19 2018 +0100

    AMBARI-23218. Remove delete custom command from Ambari Infra Solr stack. 
(#638)
---
 .../common-services/AMBARI_INFRA_SOLR/0.1.0/metainfo.xml |  8 --------
 .../0.1.0/package/scripts/collection.py                  | 16 +---------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/metainfo.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/metainfo.xml
index f5d58f7..846177a 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/metainfo.xml
@@ -68,14 +68,6 @@
                 <background>true</background>
               </commandScript>
             </customCommand>
-            <customCommand>
-              <name>DELETE</name>
-              <commandScript>
-                <script>scripts/infra_solr.py</script>
-                <scriptType>PYTHON</scriptType>
-                <timeout>600</timeout>
-              </commandScript>
-            </customCommand>
           </customCommands>
           <dependencies>
             <dependency>
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/collection.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/collection.py
index fa54cc0..9e5a896 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/collection.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/collection.py
@@ -87,18 +87,4 @@ def restore_collection(env):
       status_check_json_output = format("{index_location}/restore_status.json")
       status_check_cmd = 
command_commons.create_solr_api_request_command(solr_status_request_path, 
status_check_json_output)
       command_commons.snapshot_status_check(status_check_cmd, 
status_check_json_output, command_commons.backup_name, False,
-        log_output=command_commons.log_output, 
tries=command_commons.request_tries, 
time_interval=command_commons.request_time_interval)
-
-def delete_collection(env):
-    """
-    Delete specific Solr collection - used on ranger_audits by default
-    """
-    import params, command_commons
-    env.set_params(command_commons)
-
-    Logger.info(format("Delete Solr Collection: {collection}"))
-
-    solr_request_path = 
format("admin/collections?action=DELETE&name={collection}&wt=json")
-    delete_api_cmd = 
command_commons.create_solr_api_request_command(solr_request_path)
-
-    Execute(delete_api_cmd, user=params.infra_solr_user, logoutput=True)
\ No newline at end of file
+        log_output=command_commons.log_output, 
tries=command_commons.request_tries, 
time_interval=command_commons.request_time_interval)
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
oleew...@apache.org.

Reply via email to