From 369358f8680fd72db87d7622263ba89bca87fbde Mon Sep 17 00:00:00 2001 From: Sumanth Pasupuleti Date: Tue, 23 Mar 2021 09:50:58 -0700 Subject: [PATCH] Revert "Adding support for custom override for role_manager (#917)" (#926) This reverts commit ae1fbff70fa75b4d61703035a91342a2263842f3. Co-authored-by: Sumanth Pasupuleti --- .../netflix/priam/config/IConfiguration.java | 5 --- .../priam/config/PriamConfiguration.java | 5 --- .../netflix/priam/tuner/StandardTuner.java | 1 - .../priam/config/FakeConfiguration.java | 11 ------- .../priam/tuner/StandardTunerTest.java | 33 +++++++------------ 5 files changed, 11 insertions(+), 44 deletions(-) diff --git a/priam/src/main/java/com/netflix/priam/config/IConfiguration.java b/priam/src/main/java/com/netflix/priam/config/IConfiguration.java index 6bd2890a9..0d2e334ec 100644 --- a/priam/src/main/java/com/netflix/priam/config/IConfiguration.java +++ b/priam/src/main/java/com/netflix/priam/config/IConfiguration.java @@ -561,11 +561,6 @@ default String getAuthorizer() { return "org.apache.cassandra.auth.AllowAllAuthorizer"; } - /** Defaults to 'CassandraRoleManager'. */ - default String getRoleManager() { - return "org.apache.cassandra.auth.CassandraRoleManager"; - } - /** @return true/false, if Cassandra needs to be started manually */ default boolean doesCassandraStartManually() { return false; diff --git a/priam/src/main/java/com/netflix/priam/config/PriamConfiguration.java b/priam/src/main/java/com/netflix/priam/config/PriamConfiguration.java index 59b550c69..25d6bace8 100644 --- a/priam/src/main/java/com/netflix/priam/config/PriamConfiguration.java +++ b/priam/src/main/java/com/netflix/priam/config/PriamConfiguration.java @@ -427,11 +427,6 @@ public String getAuthorizer() { PRIAM_PRE + ".authorizer", "org.apache.cassandra.auth.AllowAllAuthorizer"); } - public String getRoleManager() { - return config.get( - PRIAM_PRE + ".roleManager", "org.apache.cassandra.auth.CassandraRoleManager"); - } - @Override public boolean doesCassandraStartManually() { return config.get(PRIAM_PRE + ".cass.manual.start.enable", false); diff --git a/priam/src/main/java/com/netflix/priam/tuner/StandardTuner.java b/priam/src/main/java/com/netflix/priam/tuner/StandardTuner.java index 6b1a1e895..3ba82c4be 100644 --- a/priam/src/main/java/com/netflix/priam/tuner/StandardTuner.java +++ b/priam/src/main/java/com/netflix/priam/tuner/StandardTuner.java @@ -104,7 +104,6 @@ public void writeAllProperties(String yamlLocation, String hostname, String seed map.put("hinted_handoff_throttle_in_kb", config.getHintedHandoffThrottleKb()); map.put("authenticator", config.getAuthenticator()); map.put("authorizer", config.getAuthorizer()); - map.put("role_manager", config.getRoleManager()); map.put("internode_compression", config.getInternodeCompression()); map.put("dynamic_snitch", config.isDynamicSnitchEnabled()); diff --git a/priam/src/test/java/com/netflix/priam/config/FakeConfiguration.java b/priam/src/test/java/com/netflix/priam/config/FakeConfiguration.java index caa3bff5f..099bc2e53 100644 --- a/priam/src/test/java/com/netflix/priam/config/FakeConfiguration.java +++ b/priam/src/test/java/com/netflix/priam/config/FakeConfiguration.java @@ -31,7 +31,6 @@ public class FakeConfiguration implements IConfiguration { private final String appName; private String restorePrefix = ""; - private String roleManager = ""; private boolean mayCreateNewToken; private ImmutableList racs; private boolean usePrivateIp; @@ -203,16 +202,6 @@ public ImmutableSet getTunablePropertyFiles() { return ImmutableSet.of(path + "/cassandra-rackdc.properties"); } - @Override - public String getRoleManager() { - return this.roleManager; - } - - public FakeConfiguration setRoleManager(String roleManager) { - this.roleManager = roleManager; - return this; - } - public String getRAC() { return "my_zone"; } diff --git a/priam/src/test/java/com/netflix/priam/tuner/StandardTunerTest.java b/priam/src/test/java/com/netflix/priam/tuner/StandardTunerTest.java index 96ec0265e..6753075c5 100644 --- a/priam/src/test/java/com/netflix/priam/tuner/StandardTunerTest.java +++ b/priam/src/test/java/com/netflix/priam/tuner/StandardTunerTest.java @@ -142,28 +142,11 @@ public void addExtraParams() throws Exception { extraParamValues.put(priamKeyName2, "test"); extraParamValues.put(priamKeyName3, "randomKeyValue"); extraParamValues.put(priamKeyName4, "randomGroupValue"); - - Map map = - applyFakeConfiguration(new TunerConfiguration(extraConfigParam, extraParamValues)); - Assert.assertEquals("your_host", map.get("listen_address")); - Assert.assertEquals("true", ((Map) map.get("client_encryption_options")).get("optional")); - Assert.assertEquals( - "test", ((Map) map.get("client_encryption_options")).get("keystore_password")); - Assert.assertEquals("randomKeyValue", map.get("randomKey")); - Assert.assertEquals("randomGroupValue", ((Map) map.get("randomGroup")).get("randomKey")); - } - - @Test - public void testRoleManagerOverride() throws Exception { - String roleManagerOverride = "org.apache.cassandra.auth.CustomRoleManager"; - Map map = - applyFakeConfiguration(new FakeConfiguration().setRoleManager(roleManagerOverride)); - Assert.assertEquals(roleManagerOverride, map.get("role_manager")); - } - - private Map applyFakeConfiguration(FakeConfiguration fakeConfiguration) throws Exception { StandardTuner tuner = - new StandardTuner(fakeConfiguration, backupRestoreConfig, instanceInfo); + new StandardTuner( + new TunerConfiguration(extraConfigParam, extraParamValues), + backupRestoreConfig, + instanceInfo); Files.copy(new File("src/main/resources/incr-restore-cassandra.yaml"), target); tuner.writeAllProperties(target.getAbsolutePath(), "your_host", "YourSeedProvider"); @@ -171,7 +154,13 @@ private Map applyFakeConfiguration(FakeConfiguration fakeConfiguration) throws E DumperOptions options = new DumperOptions(); options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); Yaml yaml = new Yaml(options); - return yaml.load(new FileInputStream(target)); + Map map = yaml.load(new FileInputStream(target)); + Assert.assertEquals("your_host", map.get("listen_address")); + Assert.assertEquals("true", ((Map) map.get("client_encryption_options")).get("optional")); + Assert.assertEquals( + "test", ((Map) map.get("client_encryption_options")).get("keystore_password")); + Assert.assertEquals("randomKeyValue", map.get("randomKey")); + Assert.assertEquals("randomGroupValue", ((Map) map.get("randomGroup")).get("randomKey")); } private class TunerConfiguration extends FakeConfiguration {