apache/master->master: 15e20d7 (#1258)

Author: kgyrtkirk

docs/api-reference/supervisor-api.md

@@ -2508,11 +2508,16 @@ curl "http://ROUTER_IP:ROUTER_PORT/druid/indexer/v1/supervisor?skipRestartIfUnmo
 
   ```json
 {
-    "id": "social_media"
+    "id": "social_media",
+    "restarted": true
 }
   ```
 </details>
 
+The response includes the following fields:
+- `id`: The supervisor ID.
+- `restarted`: A boolean indicating whether the supervisor was restarted. When `skipRestartIfUnmodified` is set to `true` and the supervisor spec is unchanged, this field will be `false`; otherwise, it will be `true`.
+
 ### Suspend a running supervisor
 
 Suspends a single running supervisor. Returns the updated supervisor spec, where the `suspended` property is set to `true`. The suspended supervisor continues to emit logs and metrics.

embedded-tests/src/test/java/org/apache/druid/testing/embedded/docker/IngestionBackwardCompatibilityDockerTest.java

@@ -37,6 +37,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 
+import java.util.Map;
+
 /**
  * Runs some basic ingestion tests using Coordinator and Overlord at version
  * {@link DruidContainer.Image#APACHE_31} and other services at current version
@@ -111,6 +113,13 @@ protected int markSegmentsAsUnused(String dataSource)
     }
   }
 
+  @Override
+  protected void validateSupervisorUpdateResponse(Map<String, String> startSupervisorResult, String supervisorId)
+  {
+    // Older Overlord versions did not include "restarted" in the API response.
+    Assertions.assertEquals(Map.of("id", supervisorId), startSupervisorResult);
+  }
+
   @Override
   protected void waitForNextCoordinatorCacheSync()
   {

embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/IngestionSmokeTest.java

@@ -297,7 +297,7 @@ public void test_runKafkaSupervisor()
     final Map<String, String> startSupervisorResult = cluster.callApi().onLeaderOverlord(
         o -> o.postSupervisor(kafkaSupervisorSpec)
     );
-    Assertions.assertEquals(Map.of("id", supervisorId), startSupervisorResult);
+    validateSupervisorUpdateResponse(startSupervisorResult, supervisorId);
 
     waitForSegmentsToBeQueryable(1);
 
@@ -417,6 +417,11 @@ private void waitForSegmentsToBeQueryable(int numSegments)
     );
   }
 
+  protected void validateSupervisorUpdateResponse(Map<String, String> startSupervisorResult, String supervisorId)
+  {
+    Assertions.assertEquals(Map.of("id", supervisorId, "restarted", "true"), startSupervisorResult);
+  }
+
   protected void waitForNextCoordinatorCacheSync()
   {
     eventCollector.latchableEmitter().waitForNextEvent(

indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResource.java

@@ -166,7 +166,7 @@ public Response specPost(
           }
 
           if (Boolean.TRUE.equals(skipRestartIfUnmodified) && !manager.shouldUpdateSupervisor(spec)) {
-            return Response.ok(ImmutableMap.of("id", spec.getId())).build();
+            return Response.ok(ImmutableMap.of("id", spec.getId(), "restarted", false)).build();
           }
 
           manager.createOrUpdateAndStartSupervisor(spec);
@@ -183,7 +183,7 @@ public Response specPost(
                         .build()
           );
 
-          return Response.ok(ImmutableMap.of("id", spec.getId())).build();
+          return Response.ok(ImmutableMap.of("id", spec.getId(), "restarted", true)).build();
         }
     );
   }

indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResourceTest.java

@@ -178,7 +178,7 @@ public List<String> getDataSources()
     verifyAll();
 
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("id", "my-id"), response.getEntity());
+    Assert.assertEquals(ImmutableMap.of("id", "my-id", "restarted", true), response.getEntity());
     resetAll();
 
     EasyMock.expect(taskMaster.getSupervisorManager()).andReturn(Optional.absent());
@@ -248,7 +248,7 @@ public List<String> getDataSources()
     verifyAll();
 
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("id", "my-id"), response.getEntity());
+    Assert.assertEquals(ImmutableMap.of("id", "my-id", "restarted", false), response.getEntity());
 
     resetAll();
 
@@ -269,7 +269,7 @@ public List<String> getDataSources()
     verifyAll();
 
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("id", "my-id"), response.getEntity());
+    Assert.assertEquals(ImmutableMap.of("id", "my-id", "restarted", true), response.getEntity());
   }
 
   @Test
@@ -300,7 +300,7 @@ public List<String> getDataSources()
     verifyAll();
 
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("id", "my-id"), response.getEntity());
+    Assert.assertEquals(ImmutableMap.of("id", "my-id", "restarted", true), response.getEntity());
     resetAll();
 
     EasyMock.expect(taskMaster.getSupervisorManager()).andReturn(Optional.absent());

processing/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java

@@ -93,6 +93,11 @@ public String getHost()
     return serviceDims.get(HOST);
   }
 
+  public Map<String, String> getServiceDims()
+  {
+    return serviceDims;
+  }
+
   public Map<String, Object> getUserDims()
   {
     return userDims;

processing/src/test/java/org/apache/druid/common/utils/SerializerUtilsTest.java

@@ -20,10 +20,10 @@
 package org.apache.druid.common.utils;
 
 import org.apache.druid.java.util.common.StringUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -47,7 +47,7 @@ public class SerializerUtilsTest
   private byte[] longsByte;
   private ByteArrayOutputStream outStream;
 
-  @Before
+  @BeforeEach
   public void setUpByteArrays() throws IOException
   {
     ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -97,15 +97,15 @@ public void testWriteInts() throws IOException
   {
     serializerUtils.writeInts(outStream, ints);
     byte[] actuals = outStream.toByteArray();
-    Assert.assertArrayEquals(intsByte, actuals);
+    Assertions.assertArrayEquals(intsByte, actuals);
   }
 
   @Test
   public void testWriteFloats() throws IOException
   {
     serializerUtils.writeFloats(outStream, floats);
     byte[] actuals = outStream.toByteArray();
-    Assert.assertArrayEquals(floatsByte, actuals);
+    Assertions.assertArrayEquals(floatsByte, actuals);
   }
 
   @Test
@@ -120,15 +120,15 @@ public void testChannelWritefloat() throws IOException
     }
     float expected = serializerUtils.readFloat(inputstream);
     float actuals = floats[index];
-    Assert.assertEquals(expected, actuals, delta);
+    Assertions.assertEquals(expected, actuals, delta);
   }
 
   @Test
   public void testWriteLongs() throws IOException
   {
     serializerUtils.writeLongs(outStream, longs);
     byte[] actuals = outStream.toByteArray();
-    Assert.assertArrayEquals(longsByte, actuals);
+    Assertions.assertArrayEquals(longsByte, actuals);
   }
 
   @Test
@@ -142,7 +142,7 @@ public void testChannelWritelong() throws IOException
     inputstream.close();
     long expected = serializerUtils.readLong(inputstream);
     long actuals = longs[index];
-    Assert.assertEquals(expected, actuals);
+    Assertions.assertEquals(expected, actuals);
   }
 
   @Test
@@ -151,7 +151,7 @@ public void testReadInts() throws IOException
     ByteArrayInputStream inputstream = new ByteArrayInputStream(intsByte);
     int[] actuals = serializerUtils.readInts(inputstream);
     inputstream.close();
-    Assert.assertArrayEquals(ints, actuals);
+    Assertions.assertArrayEquals(ints, actuals);
   }
 
   @Test
@@ -160,7 +160,7 @@ public void testReadFloats() throws IOException
     ByteArrayInputStream inputstream = new ByteArrayInputStream(floatsByte);
     float[] actuals = serializerUtils.readFloats(inputstream);
     inputstream.close();
-    Assert.assertArrayEquals(floats, actuals, delta);
+    Assertions.assertArrayEquals(floats, actuals, delta);
   }
 
   @Test
@@ -169,7 +169,7 @@ public void testReadLongs() throws IOException
     ByteArrayInputStream inputstream = new ByteArrayInputStream(longsByte);
     long[] actuals = serializerUtils.readLongs(inputstream);
     inputstream.close();
-    Assert.assertArrayEquals(longs, actuals);
+    Assertions.assertArrayEquals(longs, actuals);
   }
 
   @Test 
@@ -178,7 +178,7 @@ public void testReadStrings() throws IOException
     ByteArrayInputStream inputstream = new ByteArrayInputStream(stringsByte);
     String[] actuals = serializerUtils.readStrings(inputstream);
     inputstream.close();
-    Assert.assertArrayEquals(strings, actuals);
+    Assertions.assertArrayEquals(strings, actuals);
   }
 
   @Test
@@ -192,7 +192,7 @@ public void testChannelWriteString() throws IOException
     inputstream.close();
     String expected = serializerUtils.readString(inputstream);
     String actuals = strings[index];
-    Assert.assertEquals(expected, actuals);
+    Assertions.assertEquals(expected, actuals);
   }
 
   @Test 
@@ -202,10 +202,10 @@ public void testByteBufferReadStrings()
     buffer.put(stringsByte);
     buffer.flip();
     String[] actuals = serializerUtils.readStrings(buffer);
-    Assert.assertArrayEquals(strings, actuals);
+    Assertions.assertArrayEquals(strings, actuals);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws IOException
   {
     serializerUtils = null;