CMR-10569: fixing granule index name bug

Author: eereiter

elastic-utils-lib/src/cmr/elastic_utils/search/es_index_name_cache.clj

@@ -63,6 +63,7 @@
   (let [index-names-map (fetch-concept-type-index-names context)
         index-names (:index-names index-names-map)
         cache (hcache/context->cache context index-names-cache-key)]
+    (info (str "Refreshing search index-names cache - index-names: " index-names))
     (hcache/set-values cache index-names-cache-key index-names)
     (hcache/set-value cache
                       index-names-cache-key

indexer-app/src/cmr/indexer/data/collection_granule_aggregation_cache.clj

@@ -245,10 +245,17 @@
 (defn refresh-cache
   "Refreshes the collection granule aggregates in the cache."
   [context granules-updated-in-last-n]
-  (let [_cache (c/context->cache context coll-gran-aggregate-cache-key)]
+  (let [_cache (c/context->cache context coll-gran-aggregate-cache-key)
+        start (System/currentTimeMillis)]
+    (if granules-updated-in-last-n
+      (info "Refreshing partial collection granule aggregates cache.")
+      (info "Refreshing full collection granule aggregates cache."))
     (if granules-updated-in-last-n
       (partial-cache-refresh context granules-updated-in-last-n)
-      (full-cache-refresh context))))
+      (full-cache-refresh context))
+    (if granules-updated-in-last-n
+      (info (format "Refreshed partial collection granule aggregates cache took %d ms" (- (System/currentTimeMillis) start)))
+      (info (format "Refreshed full collection granule aggregates cache took %d ms" (- (System/currentTimeMillis) start))))))
 
 (defn get-coll-gran-aggregates
   "Returns the map of granule aggregate information for the collection. Will return nil if the

search-app/src/cmr/search/data/elastic_search_index.clj

@@ -5,6 +5,7 @@
    [cmr.common.concepts :as concepts]
    [cmr.common.config :as cfg :refer [defconfig]]
    [cmr.common.hash-cache :as hcache]
+   [cmr.common.util :as util]
    [cmr.common.services.errors :as e]
    [cmr.common.services.search.query-model :as qm]
    [cmr.elastic-utils.search.es-index :as common-esi]
@@ -40,15 +41,16 @@
         rebalancing-collections (hcache/get-value cache cache-key :rebalancing-collections)]
     (apply dissoc granule-index-names (map keyword rebalancing-collections))))
 (comment 
-  (keyword "word")
+  (println indexes)
   )
 (defn- collection-concept-id->index-name
   "Return the granule index name for the input collection concept id"
   [indexes coll-concept-id]
   (def indexes indexes)
   (def coll-concept-id coll-concept-id)
   (get indexes (keyword coll-concept-id) (if (cfg/provider-granules)
-                                           (get indexes (keyword (str "granule_" (concepts/concept-id->provider-id coll-concept-id))))
+                                           (get indexes (keyword (str "granules_" (util/safe-lowercase
+                                                                                   (concepts/concept-id->provider-id coll-concept-id)))))
                                            (get indexes :small_collections))))
 
 (defn- collection-concept-ids->index-names
@@ -57,6 +59,9 @@
   (let [indexes (get-granule-index-names context)]
     (distinct (map #(collection-concept-id->index-name indexes %) coll-concept-ids))))
 
+(comment
+  (println context)
+  )
 (defn- provider-ids->index-names
   "Return the granule index names for the input provider-ids"
   [context provider-ids]