Rename config key threadPoolSize to indexThreadPoolSize
The other plugins to merge (sync-events and evict-cache) also have this
configuration key so rename it so it's clear which thread pool it
configures.
Change-Id: I8e47942d127e2a1d391f66dfc4814f4a53fcdef8
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
index fddfe11..d1eaec8 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
@@ -36,7 +36,7 @@
private final int socketTimeout;
private final int maxTries;
private final int retryInterval;
- private final int threadPoolSize;
+ private final int indexThreadPoolSize;
@Inject
Configuration(PluginConfigFactory config,
@@ -49,7 +49,8 @@
socketTimeout = cfg.getInt("socketTimeout", DEFAULT_TIMEOUT_MS);
maxTries = cfg.getInt("maxTries", DEFAULT_MAX_TRIES);
retryInterval = cfg.getInt("retryInterval", DEFAULT_RETRY_INTERVAL);
- threadPoolSize = cfg.getInt("threadPoolSize", DEFAULT_THREAD_POOL_SIZE);
+ indexThreadPoolSize =
+ cfg.getInt("indexThreadPoolSize", DEFAULT_THREAD_POOL_SIZE);
}
public int getConnectionTimeout() {
@@ -80,7 +81,7 @@
return password;
}
- public int getThreadPoolSize() {
- return threadPoolSize;
+ public int getIndexThreadPoolSize() {
+ return indexThreadPoolSize;
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProvider.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProvider.java
index a5fa677..73aa3be 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProvider.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProvider.java
@@ -31,7 +31,7 @@
@Inject
IndexExecutorProvider(WorkQueue workQueue, Configuration config) {
- executor = workQueue.createQueue(config.getThreadPoolSize(),
+ executor = workQueue.createQueue(config.getIndexThreadPoolSize(),
"Forward-index-event");
}
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index 48b9e94..7909478 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -46,6 +46,6 @@
: The interval of time in milliseconds between the subsequent auto-retries.
When not specified, the default value is set to 1000ms.
-@PLUGIN@.threadPoolSize
+@PLUGIN@.indexThreadPoolSize
: Maximum number of threads used to send index events to the target instance.
Defaults to 1.
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
index d3dfd6e..bc1af18 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
@@ -64,7 +64,8 @@
assertThat(configuration.getSocketTimeout()).isEqualTo(TIMEOUT);
assertThat(configuration.getMaxTries()).isEqualTo(MAX_TRIES);
assertThat(configuration.getRetryInterval()).isEqualTo(RETRY_INTERVAL);
- assertThat(configuration.getThreadPoolSize()).isEqualTo(THREAD_POOL_SIZE);
+ assertThat(configuration.getIndexThreadPoolSize())
+ .isEqualTo(THREAD_POOL_SIZE);
}
@Test
@@ -77,7 +78,7 @@
assertThat(configuration.getSocketTimeout()).isEqualTo(0);
assertThat(configuration.getMaxTries()).isEqualTo(0);
assertThat(configuration.getRetryInterval()).isEqualTo(0);
- assertThat(configuration.getThreadPoolSize()).isEqualTo(0);
+ assertThat(configuration.getIndexThreadPoolSize()).isEqualTo(0);
}
@Test
@@ -101,7 +102,7 @@
.thenReturn(values ? MAX_TRIES : 0);
when(configMock.getInt("retryInterval", RETRY_INTERVAL))
.thenReturn(values ? RETRY_INTERVAL : 0);
- when(configMock.getInt("threadPoolSize", THREAD_POOL_SIZE))
+ when(configMock.getInt("indexThreadPoolSize", THREAD_POOL_SIZE))
.thenReturn(values ? THREAD_POOL_SIZE : 0);
configuration = new Configuration(cfgFactoryMock, pluginName);
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProviderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProviderTest.java
index 135324d..3db194b 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProviderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProviderTest.java
@@ -42,7 +42,7 @@
when(workQueueMock.createQueue(4, "Forward-index-event"))
.thenReturn(executorMock);
Configuration configMock = mock(Configuration.class);
- when(configMock.getThreadPoolSize()).thenReturn(4);
+ when(configMock.getIndexThreadPoolSize()).thenReturn(4);
indexExecutorProvider =
new IndexExecutorProvider(workQueueMock, configMock);
}
