SeleniumHQ
diff --git a/‎java/server/src/org/openqa/selenium/grid/data/NodeDrainStarted.java‎
Lines changed: 31 additions & 0 deletions b/‎java/server/src/org/openqa/selenium/grid/data/NodeDrainStarted.java‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎java/server/src/org/openqa/selenium/grid/node/k8s/OneShotNode.java‎
Lines changed: 2 additions & 2 deletions b/‎java/server/src/org/openqa/selenium/grid/node/k8s/OneShotNode.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎java/server/src/org/openqa/selenium/grid/node/local/LocalNode.java‎
Lines changed: 3 additions & 1 deletion b/‎java/server/src/org/openqa/selenium/grid/node/local/LocalNode.java‎
Lines changed: 3 additions & 1 deletion
@@ -0,0 +1,31 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.grid.data;
+
+import org.openqa.selenium.events.Event;
+import org.openqa.selenium.events.Type;
+
+public class NodeDrainStarted extends Event {
+
+  public static final Type NODE_DRAIN_STARTED = new Type("node-drain-started");
+
+  public NodeDrainStarted(NodeId id) {
+    super(NODE_DRAIN_STARTED, id);
+  }
+
+}
@@ -32,6 +32,7 @@
 import org.openqa.selenium.grid.data.CreateSessionRequest;
 import org.openqa.selenium.grid.data.CreateSessionResponse;
 import org.openqa.selenium.grid.data.NodeDrainComplete;
+import org.openqa.selenium.grid.data.NodeDrainStarted;
 import org.openqa.selenium.grid.data.NodeId;
 import org.openqa.selenium.grid.data.NodeStatus;
 import org.openqa.selenium.grid.data.Session;
@@ -324,8 +325,6 @@ public boolean isSupporting(Capabilities capabilities) {
 
   @Override
   public NodeStatus getStatus() {
-
-
     return new NodeStatus(
       getId(),
       getUri(),
@@ -344,6 +343,7 @@ public NodeStatus getStatus() {
 
   @Override
   public void drain() {
+    events.fire(new NodeDrainStarted(getId()));
     draining = true;
   }
 
 
@@ -35,6 +35,7 @@
 import org.openqa.selenium.grid.data.CreateSessionRequest;
 import org.openqa.selenium.grid.data.CreateSessionResponse;
 import org.openqa.selenium.grid.data.NodeDrainComplete;
+import org.openqa.selenium.grid.data.NodeDrainStarted;
 import org.openqa.selenium.grid.data.NodeId;
 import org.openqa.selenium.grid.data.NodeStatus;
 import org.openqa.selenium.grid.data.Session;
@@ -447,11 +448,12 @@ public HealthCheck getHealthCheck() {
 
   @Override
   public void drain() {
+    bus.fire(new NodeDrainStarted(getId()));
     draining = true;
     int currentSessionCount = getCurrentSessionCount();
     if (currentSessionCount == 0) {
       LOG.info("Firing node drain complete message");
-      bus.fire(new NodeDrainComplete(this.getId()));
+      bus.fire(new NodeDrainComplete(getId()));
     } else {
       pendingSessions.set(currentSessionCount);
     }