Remove swap functionality on reindex (#140)

* Update ElasticsearchQueue.scala

* Update CHANGELOG.md

* add release number

Co-authored-by: Rob Kooper <[email protected]>

Author: max-zilla

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## 1.12.2 - 2020-11-19
+
+### Changed
+- /api/reindex admin endpoint no longer deletes and swaps a temporary index, but reindexes in-place.
+
 ## 1.12.1 - 2020-11-05
 
 ### Fixed

app/services/mongodb/ElasticsearchQueue.scala

@@ -71,19 +71,29 @@ class ElasticsearchQueue @Inject() (
   }
 
   def _indexAll() = {
+    val swap = false
+
     // Add all individual entries to the queue and delete this action
     current.plugin[ElasticsearchPlugin].foreach(p => {
-      val idx = p.nameOfIndex + "_reindex_temp_swap"
-      Logger.debug("Reindexing database into temporary reindex file: "+idx)
-      p.createIndex(idx)
+      if (swap) {
+        val idx = p.nameOfIndex + "_reindex_temp_swap"
+        Logger.debug("Reindexing database into temporary reindex file: "+idx)
+        p.createIndex(idx)
 
-      // queue everything for each resource type
-      collections.indexAll(Some(idx))
-      datasets.indexAll(Some(idx))
-      files.indexAll(Some(idx))
+        // queue everything for each resource type
+        collections.indexAll(Some(idx))
+        datasets.indexAll(Some(idx))
+        files.indexAll(Some(idx))
 
-      // queue action to swap index once we're done reindexing
-      p.queue.queue("index_swap")
+        // queue action to swap index once we're done reindexing
+        p.queue.queue("index_swap")
+      } else {
+        // TODO: This does not delete the index first! It will need to do so in some cases!
+        p.createIndex()
+        collections.indexAll()
+        datasets.indexAll()
+        files.indexAll()
+      }
     })
   }
 

doc/src/sphinx/conf.py

@@ -22,7 +22,7 @@
 author = 'Luigi Marini'
 
 # The full version, including alpha/beta/rc tags
-release = '1.12.1'
+release = '1.12.2'
 
 
 # -- General configuration ---------------------------------------------------

project/Build.scala

@@ -13,7 +13,7 @@ import NativePackagerKeys._
 object ApplicationBuild extends Build {
 
   val appName = "clowder"
-  val version = "1.12.1"
+  val version = "1.12.2"
   val jvm = "1.7"
 
   def appVersion: String = {

public/swagger.yml

@@ -9,7 +9,7 @@ info:
     Clowder is a customizable and scalable data management system to support any
     data format and multiple research domains. It is under active development
     and deployed for a variety of research projects.
-  version: 1.12.1
+  version: 1.12.2
   termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos
   contact:
     name: Clowder