Skip to content

Commit 43ced49

Browse files
tommystendahltommystendahl
authored
Remove agent level in ecc.yml
1 parent 71dfd20 commit 43ced49

File tree

12 files changed

+686
-753
lines changed

12 files changed

+686
-753
lines changed

‎application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/config/connection/AgentConnectionConfig.java‎

Lines changed: 0 additions & 584 deletions
This file was deleted.

‎application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/config/connection/DistributedNativeConnection.java‎

Lines changed: 551 additions & 13 deletions
Large diffs are not rendered by default.

‎application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/providers/AgentNativeConnectionProvider.java‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.datastax.oss.driver.api.core.metadata.Node;
2121
import com.datastax.oss.driver.api.core.ssl.SslEngineFactory;
2222
import com.ericsson.bss.cassandra.ecchronos.application.config.Config;
23-
import com.ericsson.bss.cassandra.ecchronos.application.config.connection.AgentConnectionConfig;
2423
import com.ericsson.bss.cassandra.ecchronos.application.config.connection.CQLRetryPolicyConfig;
2524
import com.ericsson.bss.cassandra.ecchronos.application.config.connection.DistributedNativeConnection;
2625
import com.ericsson.bss.cassandra.ecchronos.application.config.security.ReloadingAuthProvider;
@@ -70,9 +69,6 @@ public AgentNativeConnectionProvider(
7069
final CertificateHandler certificateHandler,
7170
final DefaultRepairConfigurationProvider defaultRepairConfigurationProvider)
7271
{
73-
AgentConnectionConfig agentConnectionConfig = config.getConnectionConfig()
74-
.getCqlConnection()
75-
.getAgentConnectionConfig();
7672
DistributedNativeConnection distributedNativeConfig = config.getConnectionConfig()
7773
.getCqlConnection();
7874

@@ -94,15 +90,15 @@ public AgentNativeConnectionProvider(
9490

9591
DistributedNativeBuilder nativeConnectionBuilder =
9692
DistributedNativeConnectionProviderImpl.builder()
97-
.withInitialContactPoints(myConnectionHelper.resolveInitialContactPoints(agentConnectionConfig.getContactPoints()))
98-
.withAgentType(agentConnectionConfig.getType())
99-
.withLocalDatacenter(agentConnectionConfig.getLocalDatacenter())
93+
.withInitialContactPoints(myConnectionHelper.resolveInitialContactPoints(distributedNativeConfig.getContactPoints()))
94+
.withAgentType(distributedNativeConfig.getType())
95+
.withLocalDatacenter(distributedNativeConfig.getLocalDatacenter())
10096
.withAuthProvider(authProvider)
10197
.withSslEngineFactory(sslEngineFactory)
10298
.withSchemaChangeListener(defaultRepairConfigurationProvider)
10399
.withNodeStateListener(defaultRepairConfigurationProvider);
104100
LOG.info("Preparing Agent Connection Config");
105-
nativeConnectionBuilder = resolveAgentProviderBuilder(nativeConnectionBuilder, agentConnectionConfig);
101+
nativeConnectionBuilder = resolveAgentProviderBuilder(nativeConnectionBuilder, distributedNativeConfig);
106102
LOG.info("Establishing Connection With Nodes");
107103
myDistributedNativeConnectionProviderImpl = establishConnection(nativeConnectionBuilder, retryPolicyConfig);
108104
}
@@ -113,33 +109,33 @@ public AgentNativeConnectionProvider(
113109
*
114110
* @param builder
115111
* the {@link DistributedNativeBuilder} instance to configure.
116-
* @param agentConnectionConfig
112+
* @param distributedNativeConfig
117113
* the connection configuration object.
118114
* @return the configured {@link DistributedNativeBuilder}.
119115
*/
120116
public final DistributedNativeBuilder resolveAgentProviderBuilder(
121117
final DistributedNativeBuilder builder,
122-
final AgentConnectionConfig agentConnectionConfig)
118+
final DistributedNativeConnection distributedNativeConfig)
123119
{
124-
return switch (agentConnectionConfig.getType())
120+
return switch (distributedNativeConfig.getType())
125121
{
126122
case datacenterAware ->
127123
{
128124
LOG.info("Using DatacenterAware as Agent Config");
129125
yield builder.withDatacenterAware(myConnectionHelper.resolveDatacenterAware(
130-
agentConnectionConfig.getDatacenterAware()));
126+
distributedNativeConfig.getDatacenterAware()));
131127
}
132128
case rackAware ->
133129
{
134130
LOG.info("Using RackAware as Agent Config");
135131
yield builder.withRackAware(myConnectionHelper.resolveRackAware(
136-
agentConnectionConfig.getRackAware()));
132+
distributedNativeConfig.getRackAware()));
137133
}
138134
case hostAware ->
139135
{
140136
LOG.info("Using HostAware as Agent Config");
141137
yield builder.withHostAware(myConnectionHelper.resolveHostAware(
142-
agentConnectionConfig.getHostAware()));
138+
distributedNativeConfig.getHostAware()));
143139
}
144140
};
145141
}

‎application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/providers/MountConnectionHelper.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.List;
2121
import java.util.Map;
2222

23-
import com.ericsson.bss.cassandra.ecchronos.application.config.connection.AgentConnectionConfig;
23+
import com.ericsson.bss.cassandra.ecchronos.application.config.connection.DistributedNativeConnection;
2424

2525
public class MountConnectionHelper
2626
{
@@ -32,10 +32,10 @@ public class MountConnectionHelper
3232
* @return a list of {@link InetSocketAddress} representing the resolved contact points.
3333
*/
3434
public final List<InetSocketAddress> resolveInitialContactPoints(
35-
final Map<String, AgentConnectionConfig.Host> contactPoints)
35+
final Map<String, DistributedNativeConnection.Host> contactPoints)
3636
{
3737
List<InetSocketAddress> resolvedContactPoints = new ArrayList<>();
38-
for (AgentConnectionConfig.Host host : contactPoints.values())
38+
for (DistributedNativeConnection.Host host : contactPoints.values())
3939
{
4040
InetSocketAddress tmpAddress = InetSocketAddress.createUnresolved(host.getHost(), host.getPort());
4141
resolvedContactPoints.add(tmpAddress);
@@ -44,34 +44,34 @@ public final List<InetSocketAddress> resolveInitialContactPoints(
4444
}
4545

4646
/**
47-
* Resolves the datacenter-aware configuration from the specified {@link AgentConnectionConfig.DatacenterAware}
47+
* Resolves the datacenter-aware configuration from the specified {@link DistributedNativeConnection.DatacenterAware}
4848
* object.
4949
*
5050
* @param datacenterAware
5151
* the datacenter-aware configuration object.
5252
* @return a list of datacenter names.
5353
*/
54-
public final List<String> resolveDatacenterAware(final AgentConnectionConfig.DatacenterAware datacenterAware)
54+
public final List<String> resolveDatacenterAware(final DistributedNativeConnection.DatacenterAware datacenterAware)
5555
{
5656
List<String> datacenterNames = new ArrayList<>();
57-
for (AgentConnectionConfig.DatacenterAware.Datacenter datacenter : datacenterAware.getDatacenters().values())
57+
for (DistributedNativeConnection.DatacenterAware.Datacenter datacenter : datacenterAware.getDatacenters().values())
5858
{
5959
datacenterNames.add(datacenter.getName());
6060
}
6161
return datacenterNames;
6262
}
6363

6464
/**
65-
* Resolves the rack-aware configuration from the specified {@link AgentConnectionConfig.RackAware} object.
65+
* Resolves the rack-aware configuration from the specified {@link DistributedNativeConnection.RackAware} object.
6666
*
6767
* @param rackAware
6868
* the rack-aware configuration object.
6969
* @return a list of maps containing datacenter and rack information.
7070
*/
71-
public final List<Map<String, String>> resolveRackAware(final AgentConnectionConfig.RackAware rackAware)
71+
public final List<Map<String, String>> resolveRackAware(final DistributedNativeConnection.RackAware rackAware)
7272
{
7373
List<Map<String, String>> rackList = new ArrayList<>();
74-
for (AgentConnectionConfig.RackAware.Rack rack : rackAware.getRacks().values())
74+
for (DistributedNativeConnection.RackAware.Rack rack : rackAware.getRacks().values())
7575
{
7676
Map<String, String> rackInfo = new HashMap<>();
7777
rackInfo.put("datacenterName", rack.getDatacenterName());
@@ -82,16 +82,16 @@ public final List<Map<String, String>> resolveRackAware(final AgentConnectionCon
8282
}
8383

8484
/**
85-
* Resolves the host-aware configuration from the specified {@link AgentConnectionConfig.HostAware} object.
85+
* Resolves the host-aware configuration from the specified {@link DistributedNativeConnection.HostAware} object.
8686
*
8787
* @param hostAware
8888
* the host-aware configuration object.
8989
* @return a list of {@link InetSocketAddress} representing the resolved hosts.
9090
*/
91-
public final List<InetSocketAddress> resolveHostAware(final AgentConnectionConfig.HostAware hostAware)
91+
public final List<InetSocketAddress> resolveHostAware(final DistributedNativeConnection.HostAware hostAware)
9292
{
9393
List<InetSocketAddress> resolvedHosts = new ArrayList<>();
94-
for (AgentConnectionConfig.Host host : hostAware.getHosts().values())
94+
for (DistributedNativeConnection.Host host : hostAware.getHosts().values())
9595
{
9696
InetSocketAddress tmpAddress = new InetSocketAddress(host.getHost(), host.getPort());
9797
resolvedHosts.add(tmpAddress);

‎application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/BeanConfigurator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public BeanConfigurator() throws ConfigurationException, UnknownHostException
102102
Security security = getSecurityConfig();
103103
cqlSecurity.set(security.getCqlSecurity());
104104
jmxSecurity.set(security.getJmxSecurity());
105-
ecChronosID = getConfiguration().getConnectionConfig().getCqlConnection().getAgentConnectionConfig().getInstanceName();
105+
ecChronosID = getConfiguration().getConnectionConfig().getCqlConnection().getInstanceName();
106106
}
107107

108108
/**

‎application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/ECChronosInternals.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public ECChronosInternals(
131131
.withKeyspaceName(casLockFactoryConfig.getKeyspaceName())
132132
.withCacheExpiryInSeconds(casLockFactoryConfig.getFailureCacheExpiryTimeInSeconds())
133133
.withConsistencySerial(casLockFactoryConfig.getConsistencySerial())
134-
.withLocalDatacenter(configuration.getConnectionConfig().getCqlConnection().getAgentConnectionConfig().getLocalDatacenter())
134+
.withLocalDatacenter(configuration.getConnectionConfig().getCqlConnection().getLocalDatacenter())
135135
.build();
136136

137137
myScheduleManagerImpl = ScheduleManagerImpl.builder()

‎application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/ReloadSchedulerService.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import java.util.concurrent.ScheduledExecutorService;
2121
import java.util.concurrent.TimeUnit;
2222

23+
import com.ericsson.bss.cassandra.ecchronos.application.config.connection.DistributedNativeConnection;
2324
import org.slf4j.Logger;
2425
import org.slf4j.LoggerFactory;
2526
import org.springframework.beans.factory.DisposableBean;
2627
import org.springframework.stereotype.Service;
2728

2829
import com.datastax.oss.driver.api.core.metadata.Node;
2930
import com.ericsson.bss.cassandra.ecchronos.application.config.Config;
30-
import com.ericsson.bss.cassandra.ecchronos.application.config.connection.AgentConnectionConfig;
3131
import com.ericsson.bss.cassandra.ecchronos.application.config.connection.RetryPolicyConfig;
3232
import com.ericsson.bss.cassandra.ecchronos.application.providers.MountConnectionHelper;
3333
import com.ericsson.bss.cassandra.ecchronos.connection.DistributedNativeConnectionProvider;
@@ -56,23 +56,21 @@ public ReloadSchedulerService(
5656
this.myDefaultRepairConfigurationProvider = defaultRepairConfigurationProvider;
5757
this.myConfig = config;
5858
this.myDistributedNativeConnectionProvider = distributedNativeConnectionProvider;
59-
this.myScheduleConfig = config.getConnectionConfig().getCqlConnection().getAgentConnectionConfig().getReloadSchedule();
59+
this.myScheduleConfig = config.getConnectionConfig().getCqlConnection().getReloadSchedule();
6060
}
6161

6262
private void reloadNodesMap()
6363
{
6464
try
6565
{
6666
LOG.info("Attempting to verify nodes map disagreements.");
67-
AgentConnectionConfig agentConnectionConfig = myConfig.getConnectionConfig()
68-
.getCqlConnection()
69-
.getAgentConnectionConfig();
67+
DistributedNativeConnection nativeConnectionConfig = myConfig.getConnectionConfig().getCqlConnection();
7068

7169
DistributedNativeBuilder nativeBuilder = new DistributedNativeBuilder()
72-
.withAgentType(agentConnectionConfig.getType());
70+
.withAgentType(nativeConnectionConfig.getType());
7371

7472
// Use helper method to resolve agent provider configuration
75-
nativeBuilder = resolveAgentProviderBuilder(nativeBuilder, agentConnectionConfig);
73+
nativeBuilder = resolveAgentProviderBuilder(nativeBuilder, nativeConnectionConfig);
7674

7775
Map<UUID, Node> nodes = nativeBuilder.createNodesMap(myDistributedNativeConnectionProvider.getCqlSession());
7876
compareNodesMap(nodes);
@@ -86,27 +84,27 @@ private void reloadNodesMap()
8684
@SuppressWarnings("CPD-START")
8785
public final DistributedNativeBuilder resolveAgentProviderBuilder(
8886
final DistributedNativeBuilder builder,
89-
final AgentConnectionConfig agentConnectionConfig)
87+
final DistributedNativeConnection nativeConnectionConfig)
9088
{
91-
return switch (agentConnectionConfig.getType())
89+
return switch (nativeConnectionConfig.getType())
9290
{
9391
case datacenterAware ->
9492
{
9593
LOG.info("Using DatacenterAware as Agent Config");
9694
yield builder.withDatacenterAware(myConnectionHelper.resolveDatacenterAware(
97-
agentConnectionConfig.getDatacenterAware()));
95+
nativeConnectionConfig.getDatacenterAware()));
9896
}
9997
case rackAware ->
10098
{
10199
LOG.info("Using RackAware as Agent Config");
102100
yield builder.withRackAware(myConnectionHelper.resolveRackAware(
103-
agentConnectionConfig.getRackAware()));
101+
nativeConnectionConfig.getRackAware()));
104102
}
105103
case hostAware ->
106104
{
107105
LOG.info("Using HostAware as Agent Config");
108106
yield builder.withHostAware(myConnectionHelper.resolveHostAware(
109-
agentConnectionConfig.getHostAware()));
107+
nativeConnectionConfig.getHostAware()));
110108
}
111109
};
112110
}

0 commit comments

Comments
 (0)