Skip to content

Commit

Permalink
[Discovery Service] Remove module and all its references (apache#12119)
Browse files Browse the repository at this point in the history
* [Discovery Service] Remove module and all its references

* Explicitly declare dependency on bouncy-castle-bc in server pom.xml

* Remove unnecessary comment
  • Loading branch information
michaeljmarshall committed Sep 23, 2021
1 parent cf6673f commit 8c4c630
Show file tree
Hide file tree
Showing 33 changed files with 7 additions and 3,506 deletions.
10 changes: 0 additions & 10 deletions bin/pulsar
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ DEFAULT_BROKER_CONF=$PULSAR_HOME/conf/broker.conf
DEFAULT_BOOKKEEPER_CONF=$PULSAR_HOME/conf/bookkeeper.conf
DEFAULT_ZK_CONF=$PULSAR_HOME/conf/zookeeper.conf
DEFAULT_CONFIGURATION_STORE_CONF=$PULSAR_HOME/conf/global_zookeeper.conf
DEFAULT_DISCOVERY_CONF=$PULSAR_HOME/conf/discovery.conf
DEFAULT_PROXY_CONF=$PULSAR_HOME/conf/proxy.conf
DEFAULT_STANDALONE_CONF=$PULSAR_HOME/conf/standalone.conf
DEFAULT_WEBSOCKET_CONF=$PULSAR_HOME/conf/websocket.conf
Expand Down Expand Up @@ -135,7 +134,6 @@ where command is one of:
bookie Run a bookie server
zookeeper Run a zookeeper server
configuration-store Run a configuration-store server
discovery Run a discovery server
proxy Run a pulsar proxy
websocket Run a web socket proxy server
functions-worker Run a functions worker server
Expand Down Expand Up @@ -164,7 +162,6 @@ Environment variables:
PULSAR_BOOKKEEPER_CONF Configuration file for bookie (default: $DEFAULT_BOOKKEEPER_CONF)
PULSAR_ZK_CONF Configuration file for zookeeper (default: $DEFAULT_ZK_CONF)
PULSAR_CONFIGURATION_STORE_CONF Configuration file for global configuration store (default: $DEFAULT_CONFIGURATION_STORE_CONF)
PULSAR_DISCOVERY_CONF Configuration file for discovery service (default: $DEFAULT_DISCOVERY_CONF)
PULSAR_WEBSOCKET_CONF Configuration file for websocket proxy (default: $DEFAULT_WEBSOCKET_CONF)
PULSAR_PROXY_CONF Configuration file for Pulsar proxy (default: $DEFAULT_PROXY_CONF)
PULSAR_WORKER_CONF Configuration file for functions worker (default: $DEFAULT_WORKER_CONF)
Expand Down Expand Up @@ -239,10 +236,6 @@ if [ -z "$PULSAR_CONFIGURATION_STORE_CONF" ]; then
PULSAR_CONFIGURATION_STORE_CONF=$DEFAULT_CONFIGURATION_STORE_CONF
fi

if [ -z "$PULSAR_DISCOVERY_CONF" ]; then
PULSAR_DISCOVERY_CONF=$DEFAULT_DISCOVERY_CONF
fi

if [ -z "$PULSAR_PROXY_CONF" ]; then
PULSAR_PROXY_CONF=$DEFAULT_PROXY_CONF
fi
Expand Down Expand Up @@ -338,9 +331,6 @@ elif [ $COMMAND == "configuration-store" ]; then
# Allow global ZK to turn into read-only mode when it cannot reach the quorum
OPTS="${OPTS} ${ZK_OPTS} -Dreadonlymode.enabled=true"
exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.zookeeper.server.quorum.QuorumPeerMain $PULSAR_CONFIGURATION_STORE_CONF $@
elif [ $COMMAND == "discovery" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"discovery.log"}
exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.discovery.service.server.DiscoveryServiceStarter $PULSAR_DISCOVERY_CONF $@
elif [ $COMMAND == "proxy" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-proxy.log"}
exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.proxy.server.ProxyServiceStarter --config $PULSAR_PROXY_CONF $@
Expand Down
4 changes: 0 additions & 4 deletions bin/pulsar-daemon
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ where command is one of:
bookie Run a bookie server
zookeeper Run a zookeeper server
configuration-store Run a configuration-store server
discovery Run a discovery server
websocket Run a websocket proxy server
functions-worker Run a functions worker server
standalone Run a standalone Pulsar service
Expand Down Expand Up @@ -91,9 +90,6 @@ case $command in
(configuration-store)
echo "doing $startStop $command ..."
;;
(discovery)
echo "doing $startStop $command ..."
;;
(websocket)
echo "doing $startStop $command ..."
;;
Expand Down
90 changes: 0 additions & 90 deletions conf/discovery.conf

This file was deleted.

13 changes: 7 additions & 6 deletions distribution/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-discovery-service</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-proxy</artifactId>
Expand Down Expand Up @@ -166,6 +160,13 @@
<artifactId>simpleclient_log4j2</artifactId>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bc</artifactId>
<version>${project.version}</version>
<classifier>pkg</classifier>
</dependency>

<!-- function examples -->
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
2 changes: 0 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1965,7 +1965,6 @@ flexible messaging model and an intuitive client API.</description>
<module>pulsar-client-all</module>
<module>pulsar-websocket</module>
<module>pulsar-proxy</module>
<module>pulsar-discovery-service</module>
<module>pulsar-zookeeper-utils</module>
<module>pulsar-testclient</module>
<module>pulsar-broker-auth-athenz</module>
Expand Down Expand Up @@ -2029,7 +2028,6 @@ flexible messaging model and an intuitive client API.</description>
<module>pulsar-client-tools-test</module>
<module>pulsar-websocket</module>
<module>pulsar-proxy</module>
<module>pulsar-discovery-service</module>
<module>pulsar-zookeeper-utils</module>
<module>pulsar-testclient</module>
<module>pulsar-broker-auth-sasl</module>
Expand Down
7 changes: 0 additions & 7 deletions pulsar-broker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-discovery-service</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-websocket</artifactId>
Expand Down
Loading

0 comments on commit 8c4c630

Please sign in to comment.