more cleanup

Author: clintropolis

docs/api-reference/service-status-api.md

@@ -413,7 +413,6 @@ Host: http://ROUTER_IP:ROUTER_PORT
 Retrieves a JSON map of the form `{"selfDiscovered": true/false}`, indicating whether the node has received a confirmation from the central node discovery mechanism (currently ZooKeeper) of the Druid cluster that the node has been added to the cluster.
 
 Only consider a Druid node "healthy" or "ready" in automated deployment/container management systems when this endpoint returns `{"selfDiscovered": true}`. Nodes experiencing network issues may become isolated and are not healthy.
-For nodes that use Zookeeper segment discovery, a response of `{"selfDiscovered": true}` indicates that the node's Zookeeper client has started receiving data from the Zookeeper cluster, enabling timely discovery of segments and other nodes.
 
 #### URL
 

docs/configuration/index.md

@@ -154,7 +154,6 @@ Druid interacts with ZooKeeper through a set of standard path configurations. We
 |Property|Description|Default|
 |--------|-----------|-------|
 |`druid.zk.paths.base`|Base ZooKeeper path.|`/druid`|
-|`druid.zk.paths.announcementsPath`|Druid service announcement path.|`${druid.zk.paths.base}/announcements`|
 |`druid.zk.paths.coordinatorPath`|Used by the Coordinator for leader election.|`${druid.zk.paths.base}/coordinator`|
 
 The indexing service also uses its own set of paths. These configs can be included in the common configuration.
@@ -167,7 +166,7 @@ The indexing service also uses its own set of paths. These configs can be includ
 |`druid.zk.paths.indexer.statusPath`|Parent path for announcement of task statuses.|`${druid.zk.paths.indexer.base}/status`|
 
 If `druid.zk.paths.base` and `druid.zk.paths.indexer.base` are both set, and none of the other `druid.zk.paths.*` or `druid.zk.paths.indexer.*` values are set, then the other properties will be evaluated relative to their respective `base`.
-For example, if `druid.zk.paths.base` is set to `/druid1` and `druid.zk.paths.indexer.base` is set to `/druid2` then `druid.zk.paths.announcementsPath` will default to `/druid1/announcements` while `druid.zk.paths.indexer.announcementsPath` will default to `/druid2/announcements`.
+For example, if `druid.zk.paths.base` is set to `/druid1` and `druid.zk.paths.indexer.base` is set to `/druid2` then `druid.zk.paths.coordinatorPath` will default to `/druid1/coordinator` while `druid.zk.paths.indexer.announcementsPath` will default to `/druid2/announcements`.
 
 The following path is used for service discovery. It is **not** affected by `druid.zk.paths.base` and **must** be specified separately.
 

docs/design/zookeeper.md

@@ -58,16 +58,10 @@ ${druid.zk.paths.overlordPath}/_OVERLORD
 
 ## Service announcement and discovery
 
-All Druid services publish their presence by creating an ephemeral znode at
-
-```
-${druid.zk.paths.announcementsPath}/${druid.host}
-```
-
-In addition, each service announces a richer `DruidNode` record (host, port, role, services) under the internal-discovery path, so that other services can enumerate cluster members by role:
+Each Druid service announces a `DruidNode` record (host, port, role, services) under the internal-discovery path so that other services can enumerate cluster members by role:
 
 ```
 ${druid.zk.paths.base}/internal-discovery/${nodeRole}/${druid.host}
 ```
 
-Brokers and Coordinators use this internal-discovery path to find Historicals, Peons, and Indexers. They then poll each discovered service's HTTP `/druid-internal/v1/segments` endpoint to get its current set of served segments.
+Brokers and Coordinators use this path to find Historicals, Peons, and Indexers. They then poll each discovered service's HTTP `/druid-internal/v1/segments` endpoint to get its current set of served segments.

server/src/main/java/org/apache/druid/server/initialization/ZkPathsConfig.java

@@ -27,20 +27,13 @@ public class ZkPathsConfig
   @JsonProperty
   private String base = "druid";
   @JsonProperty
-  private String announcementsPath;
-  @JsonProperty
   private String coordinatorPath;
 
   public String getBase()
   {
     return base;
   }
 
-  public String getAnnouncementsPath()
-  {
-    return (null == announcementsPath) ? defaultPath("announcements") : announcementsPath;
-  }
-
   public String getCoordinatorPath()
   {
     return (null == coordinatorPath) ? defaultPath("coordinator") : coordinatorPath;
@@ -75,15 +68,13 @@ public boolean equals(Object other)
     }
     ZkPathsConfig otherConfig = (ZkPathsConfig) other;
     return this.getBase().equals(otherConfig.getBase()) &&
-        this.getAnnouncementsPath().equals(otherConfig.getAnnouncementsPath()) &&
         this.getCoordinatorPath().equals(otherConfig.getCoordinatorPath());
   }
 
   @Override
   public int hashCode()
   {
     int result = base != null ? base.hashCode() : 0;
-    result = 31 * result + (announcementsPath != null ? announcementsPath.hashCode() : 0);
     result = 31 * result + (coordinatorPath != null ? coordinatorPath.hashCode() : 0);
     return result;
   }

server/src/test/java/org/apache/druid/initialization/ZkPathsConfigTest.java

@@ -54,7 +54,6 @@ public void testOverrideBaseOnlyConfig()
 
     propertyValues.clear();
     propertyValues.put(StringUtils.format("%s.base", CONFIG_PREFIX), base);
-    propertyValues.put(StringUtils.format("%s.announcementsPath", CONFIG_PREFIX), ZKPaths.makePath(base, "announcements"));
     propertyValues.put(StringUtils.format("%s.coordinatorPath", CONFIG_PREFIX), ZKPaths.makePath(base, "coordinator"));
 
     ZkPathsConfig zkPathsConfigObj = zkPathsConfig.get();