Эх сурвалжийг харах

[indexer] Remove reference to SOLR_HOME

Romain Rigaux 11 жил өмнө
parent
commit
027de468d6

+ 0 - 6
desktop/conf.dist/hue.ini

@@ -871,15 +871,9 @@
   # Location of the solrctl binary.
   ## solrctl_path=/usr/bin/solrctl
 
-  # Location of the solr home.
-  ## solr_home=/usr/lib/solr
-
   # Zookeeper ensemble.
   ## solr_zk_ensemble=localhost:2181/solr
 
-  # The contents of this directory will be copied over to the solrctl host to its temporary directory.
-  ## config_template_path=/../hue/desktop/libs/indexer/src/data/solr_configs
-
 
 ###########################################################################
 # Settings to configure Job Designer

+ 0 - 6
desktop/conf/pseudo-distributed.ini.tmpl

@@ -878,15 +878,9 @@
   # Location of the solrctl binary.
   ## solrctl_path=/usr/bin/solrctl
 
-  # Location of the solr home.
-  ## solr_home=/usr/lib/solr
-
   # Zookeeper ensemble.
   ## solr_zk_ensemble=localhost:2181/solr
 
-  # The contents of this directory will be copied over to the solrctl host to its temporary directory.
-  ## config_template_path=/../hue/desktop/libs/indexer/src/data/solr_configs
-
 
 ###########################################################################
 # Settings to configure Job Designer

+ 0 - 6
desktop/libs/indexer/src/indexer/conf.py

@@ -78,12 +78,6 @@ SOLRCTL_PATH = Config(
   type=str,
   dynamic_default=solrctl)
 
-SOLR_HOME = Config(
-  key="solr_home",
-  help=_t("Location of the solr home."),
-  type=str,
-  default="/usr/lib/solr")
-
 SOLR_ZK_ENSEMBLE  = Config(
   key="solr_zk_ensemble",
   help=_t("Zookeeper ensemble."),

+ 1 - 4
desktop/libs/indexer/src/indexer/controller.py

@@ -116,7 +116,6 @@ class CollectionManagerController(object):
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE,
                                  env={
-                                   'SOLR_HOME': conf.SOLR_HOME.get(),
                                    'SOLR_ZK_ENSEMBLE': conf.SOLR_ZK_ENSEMBLE.get()
                                  })
       status = process.wait()
@@ -127,7 +126,7 @@ class CollectionManagerController(object):
       if status != 0:
         LOG.error("Could not create instance directory.\nOutput: %s\nError: %s" % process.communicate())
         raise PopupException(_('Could not create instance directory. '
-                               'Check if [indexer] solr_zk_ensemble is correct in Hue config and look at the Solr error logs for more info.'))
+                               'Check if solr_zk_ensemble and solrctl_path are correct in Hue config [indexer].'))
 
       api = SolrApi(SOLR_URL.get(), self.user, SECURITY_ENABLED.get())
       if not api.create_collection(name):
@@ -136,7 +135,6 @@ class CollectionManagerController(object):
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE,
                                    env={
-                                     'SOLR_HOME': conf.SOLR_HOME.get(),
                                      'SOLR_ZK_ENSEMBLE': conf.SOLR_ZK_ENSEMBLE.get()
                                    })
         if process.wait() != 0:
@@ -172,7 +170,6 @@ class CollectionManagerController(object):
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE,
                                    env={
-                                     'SOLR_HOME': conf.SOLR_HOME.get(),
                                      'SOLR_ZK_ENSEMBLE': conf.SOLR_ZK_ENSEMBLE.get()
                                    })
         if process.wait() != 0: