Merge branch '0.10.x'

biothings · Aug 16, 2021 · b7fde0f · b7fde0f
2 parents 700055a + 4ffd856
commit b7fde0f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/biothings/hub/dataindex/indexer.py b/biothings/hub/dataindex/indexer.py
@@ -111,6 +111,10 @@ class _BuildDoc(UserDict):
         ...
     }
     """
+    @property
+    def target_name(self):
+        return self.get("target_name", self.get("_id"))
+
     @property
     def build_config(self):
         return self.get("build_config", {})
@@ -251,7 +255,7 @@ def __init__(self, build_doc, indexer_env, index_name):
         # -----------dest-----------
 
         self.es_client_args = indexer_env.get("args", {})
-        self.es_index_name = index_name or build_doc.get("target_name")
+        self.es_index_name = index_name or _build_doc.target_name
         self.es_index_settings = IndexSettings(deepcopy(DEFAULT_INDEX_SETTINGS))
         self.es_index_mappings = IndexMappings(deepcopy(DEFAULT_INDEX_MAPPINGS))
 
@@ -262,6 +266,7 @@ def __init__(self, build_doc, indexer_env, index_name):
 
         self.env_name = indexer_env.get("name")
         self.conf_name = _build_doc.build_config.get("name")
+        self.target_name = _build_doc.target_name # name of the build
         self.logger, self.logfile = get_logger('index_%s' % self.es_index_name)
 
         self.pinfo = ProcessInfo(self, indexer_env.get("concurrency", 3))

diff --git a/biothings/hub/dataindex/indexer_registrar.py b/biothings/hub/dataindex/indexer_registrar.py
@@ -132,7 +132,7 @@ def started(self, step="index"):
             "pid": os.getpid()
         }
         self.collection.update(
-            {"_id": self.indexer.mongo_collection_name},
+            {"_id": self.indexer.target_name},
             {"$push": {
                 "jobs": job
             }}
@@ -155,8 +155,8 @@ def _done(self, func):
         assert self.stage == Stage.STARTED
         self.stage = Stage.DONE
 
-        build = self.collection.find_one({'_id': self.indexer.mongo_collection_name})
-        assert build, "Can't find build document '%s'" % self.indexer.mongo_collection_name
+        build = self.collection.find_one({'_id': self.indexer.target_name})
+        assert build, "Can't find build document '%s'" % self.indexer.target_name
 
         job = build["jobs"][-1]
         job["time"] = timesofar(self.t0)