STARTED --> ACTIVE

Author: tdas

streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala

@@ -516,7 +516,7 @@ class StreamingContext private[streaming] (
    * Return the current state of the context. The context can be in three possible states -
    * - StreamingContextState.INTIALIZED - The context has been created, but not been started yet.
    *   Input DStreams, transformations and output operations can be created on the context.
-   * - StreamingContextState.STARTED - The context has been started, and been not stopped.
+   * - StreamingContextState.ACTIVE - The context has been started, and been not stopped.
    *   Input DStreams, transformations and output operations cannot be created on the context.
    * - StreamingContextState.STOPPED - The context has been stopped and cannot be used any more.
    */
@@ -535,7 +535,7 @@ class StreamingContext private[streaming] (
     state match {
       case INITIALIZED =>
         // good to start
-      case STARTED =>
+      case ACTIVE =>
         throw new SparkException("StreamingContext has already been started")
       case STOPPED =>
         throw new SparkException("StreamingContext has already been stopped")
@@ -547,7 +547,7 @@ class StreamingContext private[streaming] (
       assertNoOtherContextIsActive()
       scheduler.start()
       uiTab.foreach(_.attach())
-      state = StreamingContextState.STARTED
+      state = StreamingContextState.ACTIVE
       setActiveContext(this)
     }
   }
@@ -615,7 +615,7 @@ class StreamingContext private[streaming] (
           logWarning("StreamingContext has not been started yet")
         case STOPPED =>
           logWarning("StreamingContext has already been stopped")
-        case STARTED =>
+        case ACTIVE =>
           scheduler.stop(stopGracefully)
           uiTab.foreach(_.detach())
           StreamingContext.setActiveContext(null)

streaming/src/main/scala/org/apache/spark/streaming/StreamingContextState.java

@@ -36,7 +36,7 @@ public enum StreamingContextState {
    * The context has been started, and been not stopped.
    * Input DStreams, transformations and output operations cannot be created on the context.
    */
-  STARTED,
+  ACTIVE,
 
   /**
    * The context has been stopped and cannot be used any more.

streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala

@@ -588,7 +588,7 @@ class JavaStreamingContext(val ssc: StreamingContext) extends Closeable {
    *   Input DStreams, transformations and output operations can be created on the context.
    *   </li>
    *   <li>
-   *   StreamingContextState.STARTED - The context has been started, and been not stopped.
+   *   StreamingContextState.ACTIVE - The context has been started, and been not stopped.
    *   Input DStreams, transformations and output operations cannot be created on the context.
    *   </li>
    *   <li>

streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java

@@ -79,7 +79,7 @@ public void testContextState() {
     JavaTestUtils.attachTestOutputStream(stream);
     Assert.assertTrue(ssc.getState() == StreamingContextState.INITIALIZED);
     ssc.start();
-    Assert.assertTrue(ssc.getState() == StreamingContextState.STARTED);
+    Assert.assertTrue(ssc.getState() == StreamingContextState.ACTIVE);
     ssc.stop();
     Assert.assertTrue(ssc.getState() == StreamingContextState.STOPPED);
   }

streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala

@@ -112,7 +112,7 @@ class StreamingContextSuite extends FunSuite with BeforeAndAfter with Timeouts w
   test("state matching") {
     import StreamingContextState._
     assert(INITIALIZED === INITIALIZED)
-    assert(INITIALIZED != STARTED)
+    assert(INITIALIZED != ACTIVE)
   }
 
   test("start and stop state check") {
@@ -121,7 +121,7 @@ class StreamingContextSuite extends FunSuite with BeforeAndAfter with Timeouts w
 
     assert(ssc.getState() === StreamingContextState.INITIALIZED)
     ssc.start()
-    assert(ssc.getState() === StreamingContextState.STARTED)
+    assert(ssc.getState() === StreamingContextState.ACTIVE)
     ssc.stop()
     assert(ssc.getState() === StreamingContextState.STOPPED)
 
@@ -135,11 +135,11 @@ class StreamingContextSuite extends FunSuite with BeforeAndAfter with Timeouts w
     ssc = new StreamingContext(master, appName, batchDuration)
     addInputStream(ssc).register()
     ssc.start()
-    assert(ssc.getState() === StreamingContextState.STARTED)
+    assert(ssc.getState() === StreamingContextState.ACTIVE)
     intercept[SparkException] {
       ssc.start()
     }
-    assert(ssc.getState() === StreamingContextState.STARTED)
+    assert(ssc.getState() === StreamingContextState.ACTIVE)
   }
 
   test("stop multiple times") {