This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 9bb3a213e8d [improve] [broker] Introduce
`metadataStoreAllowReadOnlyOperations` to deprecate
`zookeeperAllowReadOnlyOperations` (#19246)
9bb3a213e8d is described below
commit 9bb3a213e8d7fca474c8e32882f9a76e5bc649ff
Author: Yan Zhao <[email protected]>
AuthorDate: Wed Jan 18 17:18:20 2023 +0800
[improve] [broker] Introduce `metadataStoreAllowReadOnlyOperations` to
deprecate `zookeeperAllowReadOnlyOperations` (#19246)
---
.../java/org/apache/pulsar/broker/ServiceConfiguration.java | 12 ++++++++++++
.../main/java/org/apache/pulsar/broker/PulsarService.java | 4 ++--
.../org/apache/pulsar/functions/worker/WorkerConfig.java | 12 ++++++++++++
.../main/java/org/apache/pulsar/functions/worker/Worker.java | 2 +-
.../org/apache/pulsar/proxy/server/ProxyConfiguration.java | 12 ++++++++++++
.../java/org/apache/pulsar/proxy/server/ProxyService.java | 4 ++--
.../java/org/apache/pulsar/websocket/WebSocketService.java | 2 +-
7 files changed, 42 insertions(+), 6 deletions(-)
diff --git
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index 1f27641b1fa..2789860b3a2 100644
---
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -434,6 +434,12 @@ public class ServiceConfiguration implements
PulsarConfiguration {
)
private int metadataStoreCacheExpirySeconds = 300;
+ @FieldContext(
+ category = CATEGORY_SERVER,
+ doc = "Is metadata store read-only operations."
+ )
+ private boolean metadataStoreAllowReadOnlyOperations;
+
@Deprecated
@FieldContext(
category = CATEGORY_SERVER,
@@ -461,8 +467,10 @@ public class ServiceConfiguration implements
PulsarConfiguration {
)
private int zooKeeperCacheExpirySeconds = -1;
+ @Deprecated
@FieldContext(
category = CATEGORY_SERVER,
+ deprecated = true,
doc = "Is zookeeper allow read-only operations."
)
private boolean zooKeeperAllowReadOnlyOperations;
@@ -3249,6 +3257,10 @@ public class ServiceConfiguration implements
PulsarConfiguration {
return zooKeeperCacheExpirySeconds > 0 ? zooKeeperCacheExpirySeconds :
metadataStoreCacheExpirySeconds;
}
+ public boolean isMetadataStoreAllowReadOnlyOperations() {
+ return zooKeeperAllowReadOnlyOperations ||
metadataStoreAllowReadOnlyOperations;
+ }
+
public long getManagedLedgerCacheEvictionIntervalMs() {
return managedLedgerCacheEvictionFrequency > 0
? (long) (1000 / Math.max(
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
index 742f34c8d0e..c33b7a0c2d1 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
@@ -356,7 +356,7 @@ public class PulsarService implements AutoCloseable,
ShutdownService {
return
MetadataStoreFactory.create(config.getConfigurationMetadataStoreUrl(),
MetadataStoreConfig.builder()
.sessionTimeoutMillis((int)
config.getMetadataStoreSessionTimeoutMillis())
-
.allowReadOnlyOperations(config.isZooKeeperAllowReadOnlyOperations())
+
.allowReadOnlyOperations(config.isMetadataStoreAllowReadOnlyOperations())
.configFilePath(config.getMetadataStoreConfigPath())
.batchingEnabled(config.isMetadataStoreBatchingEnabled())
.batchingMaxDelayMillis(config.getMetadataStoreBatchingMaxDelayMillis())
@@ -1063,7 +1063,7 @@ public class PulsarService implements AutoCloseable,
ShutdownService {
return MetadataStoreExtended.create(config.getMetadataStoreUrl(),
MetadataStoreConfig.builder()
.sessionTimeoutMillis((int)
config.getMetadataStoreSessionTimeoutMillis())
-
.allowReadOnlyOperations(config.isZooKeeperAllowReadOnlyOperations())
+
.allowReadOnlyOperations(config.isMetadataStoreAllowReadOnlyOperations())
.configFilePath(config.getMetadataStoreConfigPath())
.batchingEnabled(config.isMetadataStoreBatchingEnabled())
.batchingMaxDelayMillis(config.getMetadataStoreBatchingMaxDelayMillis())
diff --git
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
index c7f2e116f5b..b87477f78c6 100644
---
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
+++
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
@@ -197,6 +197,12 @@ public class WorkerConfig implements Serializable,
PulsarConfiguration {
)
private int metadataStoreCacheExpirySeconds = 300;
+ @FieldContext(
+ category = CATEGORY_WORKER,
+ doc = "Is metadata store read-only operations."
+ )
+ private boolean metadataStoreAllowReadOnlyOperations;
+
@Deprecated
@FieldContext(
category = CATEGORY_WORKER,
@@ -224,8 +230,10 @@ public class WorkerConfig implements Serializable,
PulsarConfiguration {
)
private int zooKeeperCacheExpirySeconds = -1;
+ @Deprecated
@FieldContext(
category = CATEGORY_WORKER,
+ deprecated = true,
doc = "Is zooKeeper allow read-only operations."
)
private boolean zooKeeperAllowReadOnlyOperations;
@@ -911,4 +919,8 @@ public class WorkerConfig implements Serializable,
PulsarConfiguration {
public int getMetadataStoreCacheExpirySeconds() {
return zooKeeperCacheExpirySeconds > 0 ? zooKeeperCacheExpirySeconds :
metadataStoreCacheExpirySeconds;
}
+
+ public boolean isMetadataStoreAllowReadOnlyOperations() {
+ return zooKeeperAllowReadOnlyOperations ||
metadataStoreAllowReadOnlyOperations;
+ }
}
diff --git
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
index cfb71b9d429..10b35350500 100644
---
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
+++
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
@@ -77,7 +77,7 @@ public class Worker {
configMetadataStore =
PulsarResources.createConfigMetadataStore(
workerConfig.getConfigurationMetadataStoreUrl(),
(int)
workerConfig.getMetadataStoreSessionTimeoutMillis(),
- workerConfig.isZooKeeperAllowReadOnlyOperations());
+ workerConfig.isMetadataStoreAllowReadOnlyOperations());
} catch (IOException e) {
throw new PulsarServerException(e);
}
diff --git
a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java
b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java
index f2d9d9451dc..fcee04435fe 100644
---
a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java
+++
b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java
@@ -133,6 +133,12 @@ public class ProxyConfiguration implements
PulsarConfiguration {
)
private int metadataStoreCacheExpirySeconds = 300;
+ @FieldContext(
+ category = CATEGORY_SERVER,
+ doc = "Is metadata store read-only operations."
+ )
+ private boolean metadataStoreAllowReadOnlyOperations;
+
@FieldContext(
category = CATEGORY_SERVER,
doc = "Max size of messages.",
@@ -157,8 +163,10 @@ public class ProxyConfiguration implements
PulsarConfiguration {
)
private int zooKeeperCacheExpirySeconds = -1;
+ @Deprecated
@FieldContext(
category = CATEGORY_SERVER,
+ deprecated = true,
doc = "Is zooKeeper allow read-only operations."
)
private boolean zooKeeperAllowReadOnlyOperations;
@@ -916,4 +924,8 @@ public class ProxyConfiguration implements
PulsarConfiguration {
public int getMetadataStoreCacheExpirySeconds() {
return zooKeeperCacheExpirySeconds > 0 ? zooKeeperCacheExpirySeconds :
metadataStoreCacheExpirySeconds;
}
+
+ public boolean isMetadataStoreAllowReadOnlyOperations() {
+ return zooKeeperAllowReadOnlyOperations ||
metadataStoreAllowReadOnlyOperations;
+ }
}
diff --git
a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
index 01f02efb96c..dfe888d0651 100644
---
a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
+++
b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
@@ -449,13 +449,13 @@ public class ProxyService implements Closeable {
public MetadataStoreExtended createLocalMetadataStore() throws
MetadataStoreException {
return
PulsarResources.createLocalMetadataStore(proxyConfig.getMetadataStoreUrl(),
proxyConfig.getMetadataStoreSessionTimeoutMillis(),
- proxyConfig.isZooKeeperAllowReadOnlyOperations());
+ proxyConfig.isMetadataStoreAllowReadOnlyOperations());
}
public MetadataStoreExtended createConfigurationMetadataStore() throws
MetadataStoreException {
return
PulsarResources.createConfigMetadataStore(proxyConfig.getConfigurationMetadataStoreUrl(),
proxyConfig.getMetadataStoreSessionTimeoutMillis(),
- proxyConfig.isZooKeeperAllowReadOnlyOperations());
+ proxyConfig.isMetadataStoreAllowReadOnlyOperations());
}
public Authentication getProxyClientAuthenticationPlugin() {
diff --git
a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
index f928d830074..a0fe8099d01 100644
---
a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
+++
b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
@@ -113,7 +113,7 @@ public class WebSocketService implements Closeable {
try {
configMetadataStore =
createConfigMetadataStore(config.getConfigurationMetadataStoreUrl(),
(int) config.getMetadataStoreSessionTimeoutMillis(),
- config.isZooKeeperAllowReadOnlyOperations());
+ config.isMetadataStoreAllowReadOnlyOperations());
} catch (MetadataStoreException e) {
throw new PulsarServerException(e);
}
