From 361755fcaa33f2b2133261271cc625643594972f Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Tue, 29 Aug 2017 11:25:29 +0900
Subject: [PATCH] OnlineReindexer: Include index name in task name and log
 messages

The online reindexer was originally written to reindex changes, but has
since been extended to also support reindexing accounts and groups. In
future it will also support reindexing other index types, for example
projects.

The reindexer task name only includes the schema versions, but not the
index name, so it's not possible to know for which index the online
reindex task is executing. Also none of the log messages include the
index name, except the error message on reindex failure, but that is
hard-coded to say "changes".

Update the task name and log messages to show the correct index name.

Change-Id: I14e06c3db908cbda2812a5684823b3d1d300084d
---
 .../gerrit/server/index/OnlineReindexer.java  | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java
index bb6b427d4a..ed1d8b5339 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java
@@ -73,7 +73,8 @@ public class OnlineReindexer<K, V, I extends Index<K, V>> {
               }
             }
           };
-      t.setName(String.format("Reindex v%d-v%d", version(indexes.getSearchIndex()), newVersion));
+      t.setName(
+          String.format("Reindex %s v%d-v%d", name, version(indexes.getSearchIndex()), newVersion));
       t.start();
     }
   }
@@ -97,23 +98,26 @@ public class OnlineReindexer<K, V, I extends Index<K, V>> {
     index =
         checkNotNull(
             indexes.getWriteIndex(newVersion),
-            "not an active write schema version: %s",
+            "not an active write schema version: %s %s",
+            name,
             newVersion);
     log.info(
-        "Starting online reindex from schema version {} to {}",
+        "Starting online reindex of {} from schema version {} to {}",
+        name,
         version(indexes.getSearchIndex()),
         version(index));
     SiteIndexer.Result result = batchIndexer.indexAll(index);
     if (!result.success()) {
       log.error(
-          "Online reindex of schema version {} failed. Successfully"
-              + " indexed {} changes, failed to index {} changes",
+          "Online reindex of {} schema version {} failed. Successfully"
+              + " indexed {}, failed to index {}",
+          name,
           version(index),
           result.doneCount(),
           result.failedCount());
       return;
     }
-    log.info("Reindex to version {} complete", version(index));
+    log.info("Reindex {} to version {} complete", name, version(index));
     activateIndex();
     for (OnlineUpgradeListener listener : listeners) {
       listener.onSuccess(name, oldVersion, newVersion);
@@ -122,11 +126,11 @@ public class OnlineReindexer<K, V, I extends Index<K, V>> {
 
   public void activateIndex() {
     indexes.setSearchIndex(index);
-    log.info("Using schema version {}", version(index));
+    log.info("Using {} schema version {}", name, version(index));
     try {
       index.markReady(true);
     } catch (IOException e) {
-      log.warn("Error activating new schema version {}", version(index));
+      log.warn("Error activating new {} schema version {}", name, version(index));
     }
 
     List<I> toRemove = Lists.newArrayListWithExpectedSize(1);
@@ -140,7 +144,7 @@ public class OnlineReindexer<K, V, I extends Index<K, V>> {
         i.markReady(false);
         indexes.removeWriteIndex(version(i));
       } catch (IOException e) {
-        log.warn("Error deactivating old schema version {}", version(i));
+        log.warn("Error deactivating old {} schema version {}", name, version(i));
       }
     }
   }