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

HUE-7619 [indexer] Morphline indexer should not be on by default yet

New importer should be on, but not the scalable indexing yet.
Romain Rigaux 8 жил өмнө
parent
commit
abe5efc

+ 2 - 2
desktop/conf.dist/hue.ini

@@ -1289,8 +1289,8 @@
   # Location of the solrctl binary.
   ## solrctl_path=/usr/bin/solrctl
 
-  # Flag to turn on the morphline based Solr indexer.
-  ## enable_new_indexer=true
+  # Flag to turn on the Morphline Solr indexer.
+  ## enable_scalable_indexer=false
 
   # Oozie workspace template for indexing.
   ## config_indexer_libs_path=/tmp/smart_indexer_lib

+ 2 - 2
desktop/conf/pseudo-distributed.ini.tmpl

@@ -1291,8 +1291,8 @@
   # Location of the solrctl binary.
   ## solrctl_path=/usr/bin/solrctl
 
-  # Flag to turn on the morphline based Solr indexer.
-  enable_new_indexer=true
+  # Flag to turn on the Morphline Solr indexer.
+  ## enable_scalable_indexer=false
 
   # Oozie workspace template for indexing.
   ## config_indexer_libs_path=/tmp/smart_indexer_lib

+ 0 - 1
desktop/core/src/desktop/templates/assist.mako

@@ -18,7 +18,6 @@
 from django.utils.translation import ugettext as _
 
 
-from indexer.conf import ENABLE_NEW_INDEXER
 from metadata.conf import has_navigator, OPTIMIZER
 from metastore.conf import ENABLE_NEW_CREATE_TABLE
 from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, get_ordered_interpreters

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

@@ -74,6 +74,7 @@ ENABLE_NEW_IMPORTER = Config(
   default=False
 )
 
+# Deprecated as always on
 ENABLE_NEW_INDEXER = Config(
   key="enable_new_indexer",
   help=_t("Flag to turn on the new Solr indexer."),
@@ -81,6 +82,13 @@ ENABLE_NEW_INDEXER = Config(
   default=True
 )
 
+ENABLE_SCALABLE_INDEXER = Config(
+  key="enable_scalable_indexer",
+  help=_t("Flag to turn on the Morphline Solr indexer."),
+  type=bool,
+  default=False
+)
+
 CONFIG_INDEXER_LIBS_PATH = Config(
   key="config_indexer_libs_path",
   help=_t("oozie workspace template for indexing:"),

+ 2 - 2
desktop/libs/indexer/src/indexer/file_format.py

@@ -25,7 +25,7 @@ from django.utils.translation import ugettext as _
 from desktop.lib import i18n
 
 from indexer.argument import CheckboxArgument, TextDelimiterArgument
-from indexer.conf import ENABLE_NEW_INDEXER
+from indexer.conf import ENABLE_SCALABLE_INDEXER
 from indexer.fields import Field, guess_field_type_from_samples
 from indexer.indexers.morphline_operations import get_operator
 
@@ -40,7 +40,7 @@ IMPORT_PEEK_NLINES = 20
 def get_format_types():
   formats = [CSVFormat]
 
-  if ENABLE_NEW_INDEXER.get():
+  if ENABLE_SCALABLE_INDEXER.get():
     formats.extend([
       ApacheCombinedFormat,
       SyslogFormat,

+ 2 - 2
desktop/libs/indexer/src/indexer/indexers/morphline_tests.py

@@ -28,7 +28,7 @@ from desktop.lib.django_test_util import make_logged_in_client
 from desktop.lib.test_utils import grant_access, add_to_group
 from hadoop.pseudo_hdfs4 import is_live_cluster, shared_cluster
 
-from indexer.conf import ENABLE_NEW_INDEXER
+from indexer.conf import ENABLE_SCALABLE_INDEXER
 from indexer.controller import CollectionManagerController
 from indexer.file_format import ApacheCombinedFormat, RubyLogFormat, HueLogFormat
 from indexer.fields import Field
@@ -100,7 +100,7 @@ class TestIndexer():
     self.user = User.objects.get(username='test')
     self.solr_client = SolrClient(self.user, api=MockSolrCdhCloudHdfsApi())
 
-    self.finish = ENABLE_NEW_INDEXER.set_for_testing(True)
+    self.finish = ENABLE_SCALABLE_INDEXER.set_for_testing(True)
 
   def tearDown(self):
     self.finish()

+ 3 - 1
desktop/libs/indexer/src/indexer/templates/importer.mako

@@ -20,7 +20,7 @@
   from desktop import conf
   from desktop.views import commonheader, commonfooter, commonshare, commonimportexport, _ko
 
-  from indexer.conf import ENABLE_NEW_INDEXER, ENABLE_SQOOP, CONFIG_INDEXER_LIBS_PATH
+  from indexer.conf import ENABLE_NEW_INDEXER, ENABLE_SQOOP, CONFIG_INDEXER_LIBS_PATH, ENABLE_SCALABLE_INDEXER
   from notebook.conf import ENABLE_SQL_INDEXER
 %>
 
@@ -577,6 +577,7 @@ ${ assist.assistPanel() }
         <div class="card step">
           <h4>${_('Properties')}</h4>
           <div class="card-body">
+            % if ENABLE_SCALABLE_INDEXER.get():
             <div class="control-group">
               <label class="checkbox inline-block" title="${ _('Execute a cluster job to index a large dataset.') }" data-bind="visible: $root.createWizard.source.inputFormat() != 'manual'">
                 <input type="checkbox" data-bind="checked: indexerRunJob"> ${_('Index with a job')}
@@ -591,6 +592,7 @@ ${ assist.assistPanel() }
                 </a>
               <!-- /ko -->
             </div>
+            % endif
 
             <div class="control-group">
               <label for="kuduPksIndex" class="control-label"><div>${ _('Primary key') }</div>