This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push: new 4c00380 KNOX-2346 - Remove unused maxRetryAttempts and retrySleep (#316) 4c00380 is described below commit 4c003804c4c3821cb42df6c2f78505556be16b2f Author: Kevin Risden <risd...@users.noreply.github.com> AuthorDate: Tue Apr 21 10:06:23 2020 -0400 KNOX-2346 - Remove unused maxRetryAttempts and retrySleep (#316) Signed-off-by: Kevin Risden <kris...@apache.org> --- .../provider-config-wizard/ha-provider-config.ts | 2 - .../ha/deploy/HaProviderDeploymentContributor.java | 10 ---- .../knox/gateway/ha/provider/HaServiceConfig.java | 8 ---- .../ha/provider/impl/DefaultHaServiceConfig.java | 25 ---------- .../ha/provider/impl/HaDescriptorConstants.java | 4 -- .../ha/provider/impl/HaDescriptorFactory.java | 17 +------ .../ha/provider/impl/HaDescriptorManager.java | 4 -- .../ha/provider/impl/HaServiceConfigConstants.java | 8 ---- .../HaProviderDeploymentContributorTest.java | 54 +++++----------------- .../gateway/ha/dispatch/DefaultHaDispatchTest.java | 4 +- .../ha/provider/impl/HaDescriptorFactoryTest.java | 8 +--- .../ha/provider/impl/HaDescriptorManagerTest.java | 18 +++----- .../simple/ProviderConfigurationParserTest.java | 6 +-- .../simple/SimpleDescriptorHandlerTest.java | 8 ++-- .../knox/gateway/rm/dispatch/RMHaDispatchTest.java | 6 +-- .../knox/gateway/hdfs/i18n/WebHdfsMessages.java | 10 ---- .../hdfs/dispatch/WebHdfsHaDispatchTest.java | 4 +- .../org/apache/knox/gateway/PortMappingHelper.java | 2 +- .../org/apache/knox/gateway/WebHdfsHaFuncTest.java | 2 +- 19 files changed, 39 insertions(+), 161 deletions(-) diff --git a/gateway-admin-ui/admin-ui/app/provider-config-wizard/ha-provider-config.ts b/gateway-admin-ui/admin-ui/app/provider-config-wizard/ha-provider-config.ts index b39b227..30b1e05 100644 --- a/gateway-admin-ui/admin-ui/app/provider-config-wizard/ha-provider-config.ts +++ b/gateway-admin-ui/admin-ui/app/provider-config-wizard/ha-provider-config.ts @@ -45,8 +45,6 @@ export class HaProviderConfig extends DisplayBindingProviderConfig { [HaProviderConfig.SERVICE_NAME, 'serviceName'], [HaProviderConfig.MAX_FAILOVER_ATTEMPTS, 'maxFailoverAttempts'], [HaProviderConfig.FAILOVER_SLEEP, 'failoverSleep'], - [HaProviderConfig.MAX_RETRY_ATTEMPTS, 'maxRetryAttempts'], - [HaProviderConfig.RETRY_SLEEP, 'retrySleep'], [HaProviderConfig.ZK_ENSEMBLE, 'zookeeperEnsemble'], [HaProviderConfig.ZK_NAMESPACE, 'zookeeperNamespace'] ] as [string, string][]); diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributor.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributor.java index c906e10..ede0a17 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributor.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributor.java @@ -123,16 +123,6 @@ public class HaProviderDeploymentContributor extends ProviderDeploymentContribut config.setMaxFailoverAttempts(Integer.parseInt(failOverAttempts)); } - String retrySleep = serviceLevelParams.get(HaServiceConfigConstants.CONFIG_PARAM_RETRY_SLEEP); - if (retrySleep != null) { - config.setRetrySleep(Integer.parseInt(retrySleep)); - } - - String retryAttempts = serviceLevelParams.get(HaServiceConfigConstants.CONFIG_PARAM_MAX_RETRY_ATTEMPTS); - if (retryAttempts != null) { - config.setMaxRetryAttempts(Integer.parseInt(retryAttempts)); - } - String zkEnsemble = serviceLevelParams.get(HaServiceConfigConstants.CONFIG_PARAM_ZOOKEEPER_ENSEMBLE); if (zkEnsemble != null) { config.setZookeeperEnsemble(zkEnsemble); diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java index 8daa2d6..dacb8c6 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/HaServiceConfig.java @@ -34,14 +34,6 @@ public interface HaServiceConfig { int getFailoverSleep(); - void setMaxRetryAttempts(int limit); - - int getMaxRetryAttempts(); - - void setRetrySleep(int sleep); - - int getRetrySleep(); - String getZookeeperEnsemble(); void setZookeeperEnsemble(String zookeeperEnsemble); diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaServiceConfig.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaServiceConfig.java index ceb5fda..2bf6bf3 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaServiceConfig.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaServiceConfig.java @@ -29,10 +29,6 @@ public class DefaultHaServiceConfig implements HaServiceConfig, HaServiceConfigC private int failoverSleep = DEFAULT_FAILOVER_SLEEP; - private int maxRetryAttempts = DEFAULT_MAX_RETRY_ATTEMPTS; - - private int retrySleep = DEFAULT_RETRY_SLEEP; - private String zookeeperEnsemble; private String zookeeperNamespace; @@ -42,7 +38,6 @@ public class DefaultHaServiceConfig implements HaServiceConfig, HaServiceConfigC } @Override - public String getServiceName() { return name; } @@ -83,26 +78,6 @@ public class DefaultHaServiceConfig implements HaServiceConfig, HaServiceConfigC } @Override - public int getMaxRetryAttempts() { - return maxRetryAttempts; - } - - @Override - public void setMaxRetryAttempts(int maxRetryAttempts) { - this.maxRetryAttempts = maxRetryAttempts; - } - - @Override - public int getRetrySleep() { - return retrySleep; - } - - @Override - public void setRetrySleep(int retrySleep) { - this.retrySleep = retrySleep; - } - - @Override public String getZookeeperEnsemble() { return zookeeperEnsemble; } diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java index 3ee55c1..a23f732 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java @@ -38,10 +38,6 @@ public interface HaDescriptorConstants { String FAILOVER_SLEEP = "failoverSleep"; - String MAX_RETRY_ATTEMPTS = "maxRetryAttempts"; - - String RETRY_SLEEP = "retrySleep"; - String ENABLED_ATTRIBUTE = "enabled"; String ZOOKEEPER_ENSEMBLE = "zookeeperEnsemble"; diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactory.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactory.java index 4ee4dd4..c8ff28e 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactory.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactory.java @@ -34,24 +34,18 @@ public abstract class HaDescriptorFactory implements HaServiceConfigConstants { String enabledValue = configMap.get(CONFIG_PARAM_ENABLED); String maxFailoverAttempts = configMap.get(CONFIG_PARAM_MAX_FAILOVER_ATTEMPTS); String failoverSleep = configMap.get(CONFIG_PARAM_FAILOVER_SLEEP); - String maxRetryAttempts = configMap.get(CONFIG_PARAM_MAX_RETRY_ATTEMPTS); - String retrySleep = configMap.get(CONFIG_PARAM_RETRY_SLEEP); String zookeeperEnsemble = configMap.get(CONFIG_PARAM_ZOOKEEPER_ENSEMBLE); String zookeeperNamespace = configMap.get(CONFIG_PARAM_ZOOKEEPER_NAMESPACE); - return createServiceConfig(serviceName, enabledValue, maxFailoverAttempts, - failoverSleep, maxRetryAttempts, retrySleep, + return createServiceConfig(serviceName, enabledValue, maxFailoverAttempts, failoverSleep, zookeeperEnsemble, zookeeperNamespace); } public static HaServiceConfig createServiceConfig(String serviceName, String enabledValue, String maxFailoverAttemptsValue, String failoverSleepValue, - String maxRetryAttemptsValue, String retrySleepValue, String zookeeperEnsemble, String zookeeperNamespace) { boolean enabled = DEFAULT_ENABLED; int maxFailoverAttempts = DEFAULT_MAX_FAILOVER_ATTEMPTS; int failoverSleep = DEFAULT_FAILOVER_SLEEP; - int maxRetryAttempts = DEFAULT_MAX_RETRY_ATTEMPTS; - int retrySleep = DEFAULT_RETRY_SLEEP; if (enabledValue != null && !enabledValue.trim().isEmpty()) { enabled = Boolean.parseBoolean(enabledValue); } @@ -61,18 +55,11 @@ public abstract class HaDescriptorFactory implements HaServiceConfigConstants { if (failoverSleepValue != null && !failoverSleepValue.trim().isEmpty()) { failoverSleep = Integer.parseInt(failoverSleepValue); } - if (maxRetryAttemptsValue != null && !maxRetryAttemptsValue.trim().isEmpty()) { - maxRetryAttempts = Integer.parseInt(maxRetryAttemptsValue); - } - if (retrySleepValue != null && !retrySleepValue.trim().isEmpty()) { - retrySleep = Integer.parseInt(retrySleepValue); - } + DefaultHaServiceConfig serviceConfig = new DefaultHaServiceConfig(serviceName); serviceConfig.setEnabled(enabled); serviceConfig.setMaxFailoverAttempts(maxFailoverAttempts); serviceConfig.setFailoverSleep(failoverSleep); - serviceConfig.setMaxRetryAttempts(maxRetryAttempts); - serviceConfig.setRetrySleep(retrySleep); serviceConfig.setZookeeperEnsemble(zookeeperEnsemble); serviceConfig.setZookeeperNamespace(zookeeperNamespace); return serviceConfig; diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorManager.java index f1ec065..bf52a48 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorManager.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorManager.java @@ -53,8 +53,6 @@ public class HaDescriptorManager implements HaDescriptorConstants { serviceElement.setAttribute(SERVICE_NAME_ATTRIBUTE, config.getServiceName()); serviceElement.setAttribute(MAX_FAILOVER_ATTEMPTS, Integer.toString(config.getMaxFailoverAttempts())); serviceElement.setAttribute(FAILOVER_SLEEP, Integer.toString(config.getFailoverSleep())); - serviceElement.setAttribute(MAX_RETRY_ATTEMPTS, Integer.toString(config.getMaxRetryAttempts())); - serviceElement.setAttribute(RETRY_SLEEP, Integer.toString(config.getRetrySleep())); serviceElement.setAttribute(ENABLED_ATTRIBUTE, Boolean.toString(config.isEnabled())); if (config.getZookeeperEnsemble() != null) { serviceElement.setAttribute(ZOOKEEPER_ENSEMBLE, config.getZookeeperEnsemble()); @@ -86,8 +84,6 @@ public class HaDescriptorManager implements HaDescriptorConstants { element.getAttribute(ENABLED_ATTRIBUTE), element.getAttribute(MAX_FAILOVER_ATTEMPTS), element.getAttribute(FAILOVER_SLEEP), - element.getAttribute(MAX_RETRY_ATTEMPTS), - element.getAttribute(RETRY_SLEEP), element.getAttribute(ZOOKEEPER_ENSEMBLE), element.getAttribute(ZOOKEEPER_NAMESPACE)); descriptor.addServiceConfig(config); diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaServiceConfigConstants.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaServiceConfigConstants.java index f79daa2..a8c14fb 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaServiceConfigConstants.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaServiceConfigConstants.java @@ -26,10 +26,6 @@ public interface HaServiceConfigConstants { String CONFIG_PARAM_FAILOVER_SLEEP = "failoverSleep"; - String CONFIG_PARAM_MAX_RETRY_ATTEMPTS = "maxRetryAttempts"; - - String CONFIG_PARAM_RETRY_SLEEP = "retrySleep"; - String CONFIG_PARAM_ENABLED = "enabled"; String CONFIG_PARAM_ZOOKEEPER_ENSEMBLE = "zookeeperEnsemble"; @@ -40,9 +36,5 @@ public interface HaServiceConfigConstants { int DEFAULT_FAILOVER_SLEEP = 1000; - int DEFAULT_MAX_RETRY_ATTEMPTS = 3; - - int DEFAULT_RETRY_SLEEP = 1000; - boolean DEFAULT_ENABLED = true; } diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributorTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributorTest.java index 28a8f14..d92b374 100644 --- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributorTest.java +++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/deploy/HaProviderDeploymentContributorTest.java @@ -75,7 +75,7 @@ public class HaProviderDeploymentContributorTest { Map<String, String> providerParams = new HashMap<>(); // Specify all the possible params at the HaProvider level for TestRoleTwo - providerParams.put("TestRoleOne", getHaProviderParamValue(false, 40, 4, 50, 5, "testRoleOne", "http://host1:2181,http://host2:2181")); + providerParams.put("TestRoleOne", getHaProviderParamValue(false, 40, 4, "testRoleOne", "http://host1:2181,http://host2:2181")); Provider haProvider = createHaProvider(providerParams); @@ -108,7 +108,7 @@ public class HaProviderDeploymentContributorTest { assertEquals(1, descriptor.getServiceConfigs().size()); validateServiceHaConfig(descriptor.getServiceConfig("TestRoleOne"), - false, 40, 4, 50, 5, "testRoleOne", "http://host1:2181,http://host2:2181"); + false, 40, 4, "testRoleOne", "http://host1:2181,http://host2:2181"); } /* @@ -130,8 +130,6 @@ public class HaProviderDeploymentContributorTest { // Specify all the possible params in the TestRoleOne service level Map<String, String> testRoleOneParams = new HashMap<>(); testRoleOneParams.put(Service.HA_ENABLED_PARAM, "true"); - testRoleOneParams.put(HaServiceConfigConstants.CONFIG_PARAM_MAX_RETRY_ATTEMPTS, "6"); - testRoleOneParams.put(HaServiceConfigConstants.CONFIG_PARAM_RETRY_SLEEP, "60"); testRoleOneParams.put(HaServiceConfigConstants.CONFIG_PARAM_MAX_FAILOVER_ATTEMPTS, "8"); testRoleOneParams.put(HaServiceConfigConstants.CONFIG_PARAM_FAILOVER_SLEEP, "80"); testRoleOneParams.put(HaServiceConfigConstants.CONFIG_PARAM_ZOOKEEPER_NAMESPACE, "testRoleOneOverride"); @@ -163,7 +161,7 @@ public class HaProviderDeploymentContributorTest { assertEquals(1, descriptor.getServiceConfigs().size()); validateServiceHaConfig(descriptor.getServiceConfig("TestRoleOne"), - true, 80, 8, 60, 6, "testRoleOneOverride", "http://host3:2181,http://host4:2181"); + true, 80, 8, "testRoleOneOverride", "http://host3:2181,http://host4:2181"); } /* @@ -175,7 +173,7 @@ public class HaProviderDeploymentContributorTest { Map<String, String> providerParams = new HashMap<>(); // Specify all the possible params at the HaProvider level for TestRoleTwo - providerParams.put("TestRoleOne", getHaProviderParamValue(false, 40, 4, -1, 5)); + providerParams.put("TestRoleOne", getHaProviderParamValue(false, 40, 4)); Provider haProvider = createHaProvider(providerParams); @@ -185,7 +183,6 @@ public class HaProviderDeploymentContributorTest { // Specify all the possible params in the TestRoleOne service level Map<String, String> testRoleOneParams = new HashMap<>(); testRoleOneParams.put(Service.HA_ENABLED_PARAM, "true"); - testRoleOneParams.put(HaServiceConfigConstants.CONFIG_PARAM_RETRY_SLEEP, "60"); testRoleOneParams.put(HaServiceConfigConstants.CONFIG_PARAM_ZOOKEEPER_NAMESPACE, "testRoleOneOverride"); testRoleOneParams.put(HaServiceConfigConstants.CONFIG_PARAM_ZOOKEEPER_ENSEMBLE, "http://host3:2181,http://host4:2181"); @@ -215,21 +212,20 @@ public class HaProviderDeploymentContributorTest { assertEquals(1, descriptor.getServiceConfigs().size()); validateServiceHaConfig(descriptor.getServiceConfig("TestRoleOne"), - true, 40, 4, 60, 5, "testRoleOneOverride", "http://host3:2181,http://host4:2181"); + true, 40, 4, "testRoleOneOverride", "http://host3:2181,http://host4:2181"); } @Test - public void testServiceLevelParamOverrides_MultipleMixed() throws Exception { - + public void testServiceLevelParamOverrides_MultipleMixed() { // Define some provider params Map<String, String> providerParams = new HashMap<>(); // Specify a subset of the possible HaProvider-level params for TestRoleOne - providerParams.put("TestRoleOne", getHaProviderParamValue(true, 20, 2, 10, 1)); + providerParams.put("TestRoleOne", getHaProviderParamValue(true, 20, 2)); // Specify all the possible params at the HaProvider level for TestRoleTwo providerParams.put("TestRoleTwo", - getHaProviderParamValue(false, 40, 4, 30, 3, "testRoleTwo", "http://host1:2181,http://host2:2181")); + getHaProviderParamValue(false, 40, 4, "testRoleTwo", "http://host1:2181,http://host2:2181")); Provider testHaProvider = createHaProvider(providerParams); @@ -247,8 +243,6 @@ public class HaProviderDeploymentContributorTest { // Override all the possible params in the TestRoleTwo service level Map<String, String> testRoleTwoParams = new HashMap<>(); testRoleTwoParams.put(Service.HA_ENABLED_PARAM, "true"); - testRoleTwoParams.put(HaServiceConfigConstants.CONFIG_PARAM_MAX_RETRY_ATTEMPTS, "6"); - testRoleTwoParams.put(HaServiceConfigConstants.CONFIG_PARAM_RETRY_SLEEP, "60"); testRoleTwoParams.put(HaServiceConfigConstants.CONFIG_PARAM_MAX_FAILOVER_ATTEMPTS, "8"); testRoleTwoParams.put(HaServiceConfigConstants.CONFIG_PARAM_FAILOVER_SLEEP, "80"); testRoleTwoParams.put(HaServiceConfigConstants.CONFIG_PARAM_ZOOKEEPER_NAMESPACE, "testRoleTwoOverride"); @@ -280,26 +274,22 @@ public class HaProviderDeploymentContributorTest { // Validate the service with no-overrides, checking that the provider-level defaults are applied validateServiceHaConfig(descriptor.getServiceConfig("TestRoleOne"), - true, 20, 2, 10, 1, null, null); + true, 20, 2, null, null); // Validate the service with all-overrides, checking that the service-level defaults are applied validateServiceHaConfig(descriptor.getServiceConfig("TestRoleTwo"), - true, 80, 8, 60, 6, "testRoleTwoOverride", "http://host3:2181,http://host4:2181"); + true, 80, 8, "testRoleTwoOverride", "http://host3:2181,http://host4:2181"); } private static String getHaProviderParamValue(boolean enabled, long failoverSleep, - int maxFailoverAttempts, - long retrySleep, - int maxRetryAttempts) { - return getHaProviderParamValue(enabled, failoverSleep, maxFailoverAttempts, retrySleep, maxRetryAttempts, null, null); + int maxFailoverAttempts) { + return getHaProviderParamValue(enabled, failoverSleep, maxFailoverAttempts, null, null); } private static String getHaProviderParamValue(boolean enabled, long failoverSleep, int maxFailoverAttempts, - long retrySleep, - int maxRetryAttempts, String zooKeeperNamespace, String zooKeeperEnsemble) { StringBuilder builder = new StringBuilder(); @@ -308,20 +298,6 @@ public class HaProviderDeploymentContributorTest { .append(HaServiceConfigConstants.CONFIG_PAIR_DELIMITER) .append(enabled); - if (maxRetryAttempts > -1) { - builder.append(HaServiceConfigConstants.CONFIG_PAIRS_DELIMITER) - .append(HaServiceConfigConstants.CONFIG_PARAM_MAX_RETRY_ATTEMPTS) - .append(HaServiceConfigConstants.CONFIG_PAIR_DELIMITER) - .append(maxRetryAttempts); - } - - if (retrySleep > -1) { - builder.append(HaServiceConfigConstants.CONFIG_PAIRS_DELIMITER) - .append(HaServiceConfigConstants.CONFIG_PARAM_RETRY_SLEEP) - .append(HaServiceConfigConstants.CONFIG_PAIR_DELIMITER) - .append(retrySleep); - } - if (maxFailoverAttempts > -1) { builder.append(HaServiceConfigConstants.CONFIG_PAIRS_DELIMITER) .append(HaServiceConfigConstants.CONFIG_PARAM_MAX_FAILOVER_ATTEMPTS) @@ -359,8 +335,6 @@ public class HaProviderDeploymentContributorTest { * @param isEnabled The expected enabled param value * @param failoverSleep The expected failoverSleep param value * @param maxFailoverAttempts The expected maxFailoverAttempts param value - * @param retrySleep The expected retrySleep param value - * @param maxRetryAttempts The expected maxRetryAttempts param value * @param zookeeperNamespace The expected zookeeperNamespace param value * @param zookeeperEnsemble The expected zookeeperEnsemble param value */ @@ -368,16 +342,12 @@ public class HaProviderDeploymentContributorTest { boolean isEnabled, int failoverSleep, int maxFailoverAttempts, - int retrySleep, - int maxRetryAttempts, String zookeeperNamespace, String zookeeperEnsemble) { assertNotNull(config); assertEquals(isEnabled, config.isEnabled()); assertEquals(failoverSleep, config.getFailoverSleep()); assertEquals(maxFailoverAttempts, config.getMaxFailoverAttempts()); - assertEquals(retrySleep, config.getRetrySleep()); - assertEquals(maxRetryAttempts, config.getMaxRetryAttempts()); if (zookeeperNamespace == null) { assertNull(config.getZookeeperNamespace()); diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/dispatch/DefaultHaDispatchTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/dispatch/DefaultHaDispatchTest.java index 3fe41d8..d0b5492 100644 --- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/dispatch/DefaultHaDispatchTest.java +++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/dispatch/DefaultHaDispatchTest.java @@ -48,7 +48,7 @@ public class DefaultHaDispatchTest { public void testConnectivityFailover() throws Exception { String serviceName = "OOZIE"; HaDescriptor descriptor = HaDescriptorFactory.createDescriptor(); - descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig(serviceName, "true", "1", "1000", "2", "1000", null, null)); + descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig(serviceName, "true", "1", "1000", null, null)); HaProvider provider = new DefaultHaProvider(descriptor); URI uri1 = new URI( "http://unreachable-host.invalid" ); URI uri2 = new URI( "http://reachable-host.invalid" ); @@ -77,7 +77,7 @@ public class DefaultHaDispatchTest { HttpServletResponse outboundResponse = EasyMock.createNiceMock(HttpServletResponse.class); EasyMock.expect(outboundResponse.getOutputStream()).andAnswer( new IAnswer<SynchronousServletOutputStreamAdapter>() { @Override - public SynchronousServletOutputStreamAdapter answer() throws Throwable { + public SynchronousServletOutputStreamAdapter answer() { return new SynchronousServletOutputStreamAdapter() { @Override public void write( int b ) throws IOException { diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactoryTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactoryTest.java index 5e4b09f..ea2f62c 100644 --- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactoryTest.java +++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactoryTest.java @@ -34,23 +34,19 @@ public class HaDescriptorFactoryTest { @Test public void testCreateServiceConfig() { - HaServiceConfig serviceConfig = HaDescriptorFactory.createServiceConfig("foo", "enabled=true;maxFailoverAttempts=42;failoverSleep=50;maxRetryAttempts=1;retrySleep=1000"); + HaServiceConfig serviceConfig = HaDescriptorFactory.createServiceConfig("foo", "enabled=true;maxFailoverAttempts=42;failoverSleep=50"); assertNotNull(serviceConfig); assertTrue(serviceConfig.isEnabled()); assertEquals("foo", serviceConfig.getServiceName()); assertEquals(42, serviceConfig.getMaxFailoverAttempts()); assertEquals(50, serviceConfig.getFailoverSleep()); - assertEquals(1, serviceConfig.getMaxRetryAttempts()); - assertEquals(1000, serviceConfig.getRetrySleep()); - serviceConfig = HaDescriptorFactory.createServiceConfig("bar", "false", "3", "1000", "5", "3000", null, null); + serviceConfig = HaDescriptorFactory.createServiceConfig("bar", "false", "3", "1000", null, null); assertNotNull(serviceConfig); assertFalse(serviceConfig.isEnabled()); assertEquals("bar", serviceConfig.getServiceName()); assertEquals(3, serviceConfig.getMaxFailoverAttempts()); assertEquals(1000, serviceConfig.getFailoverSleep()); - assertEquals(5, serviceConfig.getMaxRetryAttempts()); - assertEquals(3000, serviceConfig.getRetrySleep()); } } diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorManagerTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorManagerTest.java index f64017d..5aaf3c7 100644 --- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorManagerTest.java +++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorManagerTest.java @@ -37,7 +37,7 @@ import static org.xmlmatchers.transform.XmlConverters.the; public class HaDescriptorManagerTest { @Test public void testDescriptorLoad() throws IOException { - String xml = "<ha><service name='foo' maxFailoverAttempts='42' failoverSleep='4000' maxRetryAttempts='2' retrySleep='2213' enabled='false'/>" + + String xml = "<ha><service name='foo' maxFailoverAttempts='42' failoverSleep='4000' enabled='false'/>" + "<service name='bar' failoverLimit='3' enabled='true'/></ha>"; ByteArrayInputStream inputStream = new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)); HaDescriptor descriptor = HaDescriptorManager.load(inputStream); @@ -48,8 +48,6 @@ public class HaDescriptorManagerTest { assertEquals("foo", config.getServiceName()); assertEquals(42, config.getMaxFailoverAttempts()); assertEquals(4000, config.getFailoverSleep()); - assertEquals(2, config.getMaxRetryAttempts()); - assertEquals(2213, config.getRetrySleep()); assertFalse(config.isEnabled()); config = descriptor.getServiceConfig("bar"); assertTrue(config.isEnabled()); @@ -67,24 +65,22 @@ public class HaDescriptorManagerTest { assertEquals("foo", config.getServiceName()); assertEquals(HaServiceConfigConstants.DEFAULT_MAX_FAILOVER_ATTEMPTS, config.getMaxFailoverAttempts()); assertEquals(HaServiceConfigConstants.DEFAULT_FAILOVER_SLEEP, config.getFailoverSleep()); - assertEquals(HaServiceConfigConstants.DEFAULT_MAX_RETRY_ATTEMPTS, config.getMaxRetryAttempts()); - assertEquals(HaServiceConfigConstants.DEFAULT_RETRY_SLEEP, config.getRetrySleep()); assertEquals(HaServiceConfigConstants.DEFAULT_ENABLED, config.isEnabled()); } @Test public void testDescriptorStoring() throws IOException { HaDescriptor descriptor = HaDescriptorFactory.createDescriptor(); - descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig("foo", "false", "42", "1000", "3", "3000", "foo:2181,bar:2181", "hiveserver2")); - descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig("bar", "true", "3", "5000", "5", "8000", null, null)); + descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig("foo", "false", "42", "1000", "foo:2181,bar:2181", "hiveserver2")); + descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig("bar", "true", "3", "5000", null, null)); StringWriter writer = new StringWriter(); HaDescriptorManager.store(descriptor, writer); String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + "<ha>\n" + - " <service enabled=\"false\" failoverSleep=\"1000\" maxFailoverAttempts=\"42\" maxRetryAttempts=\"3\" name=\"foo\" retrySleep=\"3000\" zookeeperEnsemble=\"foo:2181,bar:2181\" zookeeperNamespace=\"hiveserver2\"/>\n" + - " <service enabled=\"true\" failoverSleep=\"5000\" maxFailoverAttempts=\"3\" maxRetryAttempts=\"5\" name=\"bar\" retrySleep=\"8000\"/>\n" + + " <service enabled=\"false\" failoverSleep=\"1000\" maxFailoverAttempts=\"42\" name=\"foo\" zookeeperEnsemble=\"foo:2181,bar:2181\" zookeeperNamespace=\"hiveserver2\"/>\n" + + " <service enabled=\"true\" failoverSleep=\"5000\" maxFailoverAttempts=\"3\" name=\"bar\"/>\n" + "</ha>\n"; - assertThat( the( xml ), hasXPath( "/ha/service[@enabled='false' and @failoverSleep='1000' and @maxFailoverAttempts='42' and @maxRetryAttempts='3' and @name='foo' and @retrySleep='3000' and @zookeeperEnsemble='foo:2181,bar:2181' and @zookeeperNamespace='hiveserver2']" ) ); - assertThat( the( xml ), hasXPath( "/ha/service[@enabled='true' and @failoverSleep='5000' and @maxFailoverAttempts='3' and @maxRetryAttempts='5' and @name='bar' and @retrySleep='8000']" ) ); + assertThat( the( xml ), hasXPath( "/ha/service[@enabled='false' and @failoverSleep='1000' and @maxFailoverAttempts='42' and @name='foo' and @zookeeperEnsemble='foo:2181,bar:2181' and @zookeeperNamespace='hiveserver2']" ) ); + assertThat( the( xml ), hasXPath( "/ha/service[@enabled='true' and @failoverSleep='5000' and @maxFailoverAttempts='3' and @name='bar']" ) ); } } diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java index 27217ae..e295302 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java @@ -158,7 +158,7 @@ public class ProviderConfigurationParserTest { " \"name\":\"HaProvider\",\n" + " \"enabled\":\"false\",\n" + " \"params\":{\n" + - " \"WEBHDFS\":\"maxFailoverAttempts=3;failoverSleep=1000;maxRetryAttempts=300;retrySleep=1000;enabled=true\",\n" + + " \"WEBHDFS\":\"maxFailoverAttempts=3;failoverSleep=1000;enabled=true\",\n" + " \"HIVE\":\"maxFailoverAttempts=3;failoverSleep=1000;enabled=true\"\n" + " }\n" + " }\n" + @@ -219,7 +219,7 @@ public class ProviderConfigurationParserTest { " name: HaProvider\n" + " enabled: false\n" + " params:\n" + - " WEBHDFS: maxFailoverAttempts=3;failoverSleep=1000;maxRetryAttempts=300;retrySleep=1000;enabled=true\n" + + " WEBHDFS: maxFailoverAttempts=3;failoverSleep=1000;enabled=true\n" + " HIVE: maxFailoverAttempts=3;failoverSleep=1000;enabled=true"; ProviderConfiguration pc = doTestParseProviderConfiguration(YAML, "my-providers." + extension); @@ -280,7 +280,7 @@ public class ProviderConfigurationParserTest { Map<String, String> params = provider.getParams(); assertNotNull(params); assertEquals(2, params.size()); - assertEquals(params.get("WEBHDFS"), "maxFailoverAttempts=3;failoverSleep=1000;maxRetryAttempts=300;retrySleep=1000;enabled=true"); + assertEquals(params.get("WEBHDFS"), "maxFailoverAttempts=3;failoverSleep=1000;enabled=true"); assertEquals(params.get("HIVE"), "maxFailoverAttempts=3;failoverSleep=1000;enabled=true"); } else if ("dummy".equals(provider.getRole())) { assertEquals("NoParamsDummyProvider", provider.getName()); diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandlerTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandlerTest.java index 4a6bc13..d6ecc81 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandlerTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandlerTest.java @@ -121,10 +121,10 @@ public class SimpleDescriptorHandlerTest { " <role>ha</role>\n" + " <name>HaProvider</name>\n" + " <enabled>true</enabled>\n" + - " <param><name>HIVE</name><value>enabled=auto;retrySleep=20;maxRetryAttempts=3</value></param>\n" + - " <param><name>WEBHDFS</name><value>enabled=true;retrySleep=40;maxRetryAttempts=5</value></param>\n" + - " <param><name>WEBHBASE</name><value>enabled=auto;retrySleep=30;maxRetryAttempts=3;maxFailoverAttempts=2;failoverSleep=10</value></param>\n" + - " <param><name>ATLAS</name><value>enabled=auto;retrySleep=30;maxRetryAttempts=3;maxFailoverAttempts=2;failoverSleep=10</value></param>\n" + + " <param><name>HIVE</name><value>enabled=auto</value></param>\n" + + " <param><name>WEBHDFS</name><value>enabled=true</value></param>\n" + + " <param><name>WEBHBASE</name><value>enabled=auto;maxFailoverAttempts=2;failoverSleep=10</value></param>\n" + + " <param><name>ATLAS</name><value>enabled=auto;maxFailoverAttempts=2;failoverSleep=10</value></param>\n" + " <param><name>ATLAS-API</name><value>enabled=false</value></param>\n" + " </provider>\n" + " </gateway>\n"; diff --git a/gateway-service-rm/src/test/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatchTest.java b/gateway-service-rm/src/test/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatchTest.java index 132bce2..0c3b1b9 100644 --- a/gateway-service-rm/src/test/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatchTest.java +++ b/gateway-service-rm/src/test/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatchTest.java @@ -58,7 +58,7 @@ public class RMHaDispatchTest { public void testConnectivityFailure() throws Exception { String serviceName = "RESOURCEMANAGER"; HaDescriptor descriptor = HaDescriptorFactory.createDescriptor(); - descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig(serviceName, "true", "1", "1000", "2", "1000", null, null)); + descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig(serviceName, "true", "1", "1000", null, null)); HaProvider provider = new DefaultHaProvider(descriptor); URI uri1 = new URI("http://unreachable-host.invalid"); URI uri2 = new URI("http://reachable-host.invalid"); @@ -129,7 +129,7 @@ public class RMHaDispatchTest { public void testConnectivityFailover() throws Exception { String serviceName = "RESOURCEMANAGER"; HaDescriptor descriptor = HaDescriptorFactory.createDescriptor(); - descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig(serviceName, "true", "1", "1000", "2", "1000", null, null)); + descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig(serviceName, "true", "1", "1000", null, null)); HaProvider provider = new DefaultHaProvider(descriptor); URI uri1 = new URI("http://passive-host.invalid"); URI uri2 = new URI("http://other-host.invalid"); @@ -166,7 +166,7 @@ public class RMHaDispatchTest { HttpServletResponse outboundResponse = EasyMock.createNiceMock(HttpServletResponse.class); EasyMock.expect(outboundResponse.getOutputStream()).andAnswer(new IAnswer<ServletOutputStream>() { @Override - public ServletOutputStream answer() throws Throwable { + public ServletOutputStream answer() { return new ServletOutputStream() { @Override public void write(int b) throws IOException { diff --git a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/i18n/WebHdfsMessages.java b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/i18n/WebHdfsMessages.java index 5a244ea..543a6c4 100644 --- a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/i18n/WebHdfsMessages.java +++ b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/i18n/WebHdfsMessages.java @@ -25,19 +25,9 @@ import org.apache.knox.gateway.i18n.messages.StackTrace; @Messages(logger = "org.apache.knox.gateway") public interface WebHdfsMessages extends HaDispatchMessages { - @Message(level = MessageLevel.INFO, text = "Received an error from a node in Standby: {0}") void errorReceivedFromStandbyNode(@StackTrace(level = MessageLevel.DEBUG) Exception e); @Message(level = MessageLevel.INFO, text = "Received an error from a node in SafeMode: {0}") void errorReceivedFromSafeModeNode(@StackTrace(level = MessageLevel.DEBUG) Exception e); - - @Message(level = MessageLevel.INFO, text = "Retrying request to a server: {0}") - void retryingRequest(String uri); - - @Message(level = MessageLevel.INFO, text = "Maximum attempts {0} to retry reached for service: {1} at url : {2}") - void maxRetryAttemptsReached(int attempts, String service, String url); - - @Message(level = MessageLevel.INFO, text = "Error occurred while trying to sleep for retry : {0} {1}") - void retrySleepFailed(String service, @StackTrace(level = MessageLevel.DEBUG) Exception e); } diff --git a/gateway-service-webhdfs/src/test/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatchTest.java b/gateway-service-webhdfs/src/test/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatchTest.java index 03feaf3..02a4114 100644 --- a/gateway-service-webhdfs/src/test/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatchTest.java +++ b/gateway-service-webhdfs/src/test/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatchTest.java @@ -48,7 +48,7 @@ public class WebHdfsHaDispatchTest { public void testConnectivityFailover() throws Exception { String serviceName = "WEBHDFS"; HaDescriptor descriptor = HaDescriptorFactory.createDescriptor(); - descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig(serviceName, "true", "1", "1000", "2", "1000", null, null)); + descriptor.addServiceConfig(HaDescriptorFactory.createServiceConfig(serviceName, "true", "1", "1000", null, null)); HaProvider provider = new DefaultHaProvider(descriptor); URI uri1 = new URI( "http://unreachable-host.invalid" ); URI uri2 = new URI( "http://reachable-host.invalid" ); @@ -77,7 +77,7 @@ public class WebHdfsHaDispatchTest { HttpServletResponse outboundResponse = EasyMock.createNiceMock(HttpServletResponse.class); EasyMock.expect(outboundResponse.getOutputStream()).andAnswer( new IAnswer<SynchronousServletOutputStreamAdapter>() { @Override - public SynchronousServletOutputStreamAdapter answer() throws Throwable { + public SynchronousServletOutputStreamAdapter answer() { return new SynchronousServletOutputStreamAdapter() { @Override public void write( int b ) throws IOException { diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/PortMappingHelper.java b/gateway-test/src/test/java/org/apache/knox/gateway/PortMappingHelper.java index cd441db..ab39e92 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/PortMappingHelper.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/PortMappingHelper.java @@ -146,7 +146,7 @@ public abstract class PortMappingHelper { .addTag("role").addText("ha").addTag("enabled").addText("true") .addTag("name").addText("HaProvider").addTag("param").addTag("name") .addText("WEBHDFS").addTag("value").addText( - "maxFailoverAttempts=3;failoverSleep=15;maxRetryAttempts=3;retrySleep=10;enabled=true") + "maxFailoverAttempts=3;failoverSleep=15;enabled=true") .gotoParent().gotoRoot().addTag("service").addTag("role").addText(role) .addTag("url").addText("http://localhost:" + gatewayPort + "/webhdfs") .gotoRoot(); diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java index f7bf68a..388560e 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java @@ -142,7 +142,7 @@ public class WebHdfsHaFuncTest { .addTag("name").addText("HaProvider") .addTag("param") .addTag("name").addText("WEBHDFS") - .addTag("value").addText("maxFailoverAttempts=3;failoverSleep=15;maxRetryAttempts=3;retrySleep=10;enabled=true").gotoParent() + .addTag("value").addText("maxFailoverAttempts=3;failoverSleep=15;enabled=true").gotoParent() .gotoRoot() .addTag("service") .addTag("role").addText("WEBHDFS")