Merge pull request #15830 from vespa-engine/jonmv/reindexing-on-by-default

Turn on reindexing by default

4 files changed, 6 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/MbusClient.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/MbusClient.java
index 533fc36aad3..f837695d65e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/MbusClient.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/MbusClient.java
@@ -10,7 +10,7 @@ import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.container.component.Handler;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class MbusClient extends Handler<AbstractConfigProducer<?>> implements SessionConfig.Producer {
     private static final ComponentSpecification CLASSNAME =
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index a53c0bd6a78..98cccbc265e 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -266,7 +266,7 @@ public class Flags {
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundBooleanFlag ENABLE_AUTOMATIC_REINDEXING = defineFeatureFlag(
-            "enable-automatic-reindexing", false,
+            "enable-automatic-reindexing", true,
             List.of("bjorncs", "jonmv"), "2020-12-02", "2021-02-01",
             "Whether to automatically trigger reindexing from config change",
             "Takes effect on next internal redeployment",
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
index 309316b450a..ca772ce6c3a 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
@@ -4,7 +4,7 @@ package com.yahoo.messagebus;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * A session which supports receiving, forwarding and acknowledgement of messages. An intermediate session is expacted
+ * A session which supports receiving, forwarding and acknowledging messages. An intermediate session is expected
  * to either forward or acknowledge every message received.
  *
  * @author Simon Thoresen Hult
@@ -49,7 +49,7 @@ public final class IntermediateSession implements MessageHandler, ReplyHandler {
     /**
      * This method unregisters this session from message bus, effectively disabling any more messages from being
      * delivered to the message handler. After unregistering, this method calls {@link com.yahoo.messagebus.MessageBus#sync()}
-     * as to ensure that there are no threads currently entangled in the handler.
+     * to ensure that there are no threads currently entangled in the handler.
      *
      * This method will deadlock if you call it from the message or reply handler.
      */
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
index 0b731a4c6fb..204bf2f7906 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
@@ -186,7 +186,7 @@ public final class SourceSession implements ReplyHandler, MessageBus.SendBlocked
             if (msg.isExpired()) {
                 Error error = new Error(ErrorCode.TIMEOUT, "Timed out in sendQ");
                 notifyComplete(new Result(error));
-                replyHandler.handleReply(createSendTimedoutReply(msg, error));
+                replyHandler.handleReply(createSendTimedOutReply(msg, error));
                 return true;
             }
             return false;
@@ -214,7 +214,7 @@ public final class SourceSession implements ReplyHandler, MessageBus.SendBlocked
         }
     }
 
-    private Reply createSendTimedoutReply(Message msg, Error error) {
+    private Reply createSendTimedOutReply(Message msg, Error error) {
         Reply reply = new EmptyReply();
         reply.setMessage(msg);
         reply.addError(error);