Skip to content

Commit 8f86b49

Browse files
sumandas0sumandas0
committed
fix: change naming from sdk cluster to non-product cluster
1 parent e64b133 commit 8f86b49

File tree

5 files changed

+26
-34
lines changed

5 files changed

+26
-34
lines changed

‎graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasElasticsearchDatabase.java

+9-17
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class AtlasElasticsearchDatabase {
3838
private static volatile RestClient lowLevelClient;
3939

4040
private static volatile RestClient esProductClusterClient;
41-
private static volatile RestClient esSDKClusterClient;
41+
private static volatile RestClient esNonProductClusterClient;
4242
public static final String INDEX_BACKEND_CONF = "atlas.graph.index.search.hostname";
4343

4444
public static List<HttpHost> getHttpHosts() throws AtlasException {
@@ -115,10 +115,6 @@ public static RestClient getProductClusterClient() {
115115
if (esProductClusterClient == null) {
116116
try {
117117
HttpHost productHost = HttpHost.create(AtlasConfiguration.ATLAS_ELASTICSEARCH_PRODUCT_SEARCH_CLUSTER_URL.getString());
118-
if (productHost == null) {
119-
LOG.error("Invalid product cluster URL configuration");
120-
return null;
121-
}
122118

123119
RestClientBuilder builder = RestClient.builder(productHost);
124120
builder.setHttpClientConfigCallback(httpAsyncClientBuilder ->
@@ -138,37 +134,33 @@ public static RestClient getProductClusterClient() {
138134
return esProductClusterClient;
139135
}
140136

141-
public static RestClient getSDKClusterClient() {
137+
public static RestClient getNonProductSearchClusterClient() {
142138
if (!AtlasConfiguration.ATLAS_INDEXSEARCH_ENABLE_REQUEST_ISOLATION.getBoolean()) {
143139
return null;
144140
}
145141

146-
if (esSDKClusterClient == null) {
142+
if (esNonProductClusterClient == null) {
147143
synchronized (AtlasElasticsearchDatabase.class) {
148-
if (esSDKClusterClient == null) {
144+
if (esNonProductClusterClient == null) {
149145
try {
150-
HttpHost sdkHost = HttpHost.create(AtlasConfiguration.ATLAS_ELASTICSEARCH_SDK_SEARCH_CLUSTER_URL.getString());
151-
if (sdkHost == null) {
152-
LOG.error("Invalid SDK cluster URL configuration");
153-
return null;
154-
}
146+
HttpHost nonProductHost = HttpHost.create(AtlasConfiguration.ATLAS_ELASTICSEARCH_NON_PRODUCT_SEARCH_CLUSTER_URL.getString());
155147

156-
RestClientBuilder builder = RestClient.builder(sdkHost);
148+
RestClientBuilder builder = RestClient.builder(nonProductHost);
157149
builder.setHttpClientConfigCallback(httpAsyncClientBuilder ->
158150
httpAsyncClientBuilder.setKeepAliveStrategy(((httpResponse, httpContext) -> 3600000)));
159151
builder.setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder
160152
.setConnectTimeout(AtlasConfiguration.INDEX_CLIENT_CONNECTION_TIMEOUT.getInt())
161153
.setSocketTimeout(AtlasConfiguration.INDEX_CLIENT_SOCKET_TIMEOUT.getInt()));
162154

163-
esSDKClusterClient = builder.build();
155+
esNonProductClusterClient = builder.build();
164156
} catch (Exception e) {
165-
LOG.error("Failed to initialize SDK cluster client", e);
157+
LOG.error("Failed to initialize Non-product cluster client", e);
166158
return null;
167159
}
168160
}
169161
}
170162
}
171-
return esSDKClusterClient;
163+
return esNonProductClusterClient;
172164
}
173165

174166

‎graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasElasticsearchQuery.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class AtlasElasticsearchQuery implements AtlasIndexQuery<AtlasJanusVertex
7272
private RestClient lowLevelRestClient;
7373

7474
private RestClient esProductClusterClient;
75-
private RestClient esSDKClusterClient;
75+
private RestClient esNonProductClusterClient;
7676
private String index;
7777
private SearchSourceBuilder sourceBuilder;
7878
private SearchResponse searchResponse;
@@ -85,11 +85,11 @@ public AtlasElasticsearchQuery(AtlasJanusGraph graph, RestHighLevelClient esClie
8585
this.sourceBuilder = sourceBuilder;
8686
}
8787

88-
public AtlasElasticsearchQuery(AtlasJanusGraph graph, RestClient restClient, String index, SearchParams searchParams, RestClient esProductClusterClient, RestClient esSDKClusterClient) {
88+
public AtlasElasticsearchQuery(AtlasJanusGraph graph, RestClient restClient, String index, SearchParams searchParams, RestClient esProductClusterClient, RestClient esNonProductClusterClient) {
8989
this(graph, index);
9090
this.lowLevelRestClient = restClient;
9191
this.esProductClusterClient = esProductClusterClient;
92-
this.esSDKClusterClient = esSDKClusterClient;
92+
this.esNonProductClusterClient = esNonProductClusterClient;
9393
this.searchParams = searchParams;
9494
}
9595

@@ -99,8 +99,8 @@ private AtlasElasticsearchQuery(AtlasJanusGraph graph, String index) {
9999
searchResponse = null;
100100
}
101101

102-
public AtlasElasticsearchQuery(AtlasJanusGraph graph, String index, RestClient restClient,RestClient esProductClusterClient, RestClient esSDKClusterClient) {
103-
this(graph, restClient, index, null, esProductClusterClient, esSDKClusterClient);
102+
public AtlasElasticsearchQuery(AtlasJanusGraph graph, String index, RestClient restClient,RestClient esProductClusterClient, RestClient esNonProductClusterClient) {
103+
this(graph, restClient, index, null, esProductClusterClient, esNonProductClusterClient);
104104
}
105105

106106
public AtlasElasticsearchQuery(String index, RestClient restClient) {
@@ -134,7 +134,7 @@ private RestClient getESClient() {
134134
return Optional.ofNullable(esProductClusterClient)
135135
.orElse(lowLevelRestClient);
136136
} else {
137-
return Optional.ofNullable(esSDKClusterClient)
137+
return Optional.ofNullable(esNonProductClusterClient)
138138
.orElse(lowLevelRestClient);
139139
}
140140

‎graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getClient;
103103
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getLowLevelClient;
104104
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getProductClusterClient;
105-
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getSDKClusterClient;
105+
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getNonProductSearchClusterClient;
106106
import static org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase.getGraphInstance;
107107
import static org.apache.atlas.type.Constants.STATE_PROPERTY_KEY;
108108

@@ -122,8 +122,8 @@ public class AtlasJanusGraph implements AtlasGraph<AtlasJanusVertex, AtlasJanusE
122122
private final RestHighLevelClient elasticsearchClient;
123123
private final RestClient restClient;
124124

125-
private final RestClient esProductClusterClient;
126-
private final RestClient esSDKClusterClient;
125+
private final RestClient esProductClusterClient;
126+
private final RestClient esNonProductClusterClient;
127127

128128
private final ThreadLocal<GremlinGroovyScriptEngine> scriptEngine = ThreadLocal.withInitial(() -> {
129129
DefaultImportCustomizer.Builder builder = DefaultImportCustomizer.build()
@@ -134,10 +134,10 @@ public class AtlasJanusGraph implements AtlasGraph<AtlasJanusVertex, AtlasJanusE
134134
});
135135

136136
public AtlasJanusGraph() {
137-
this(getGraphInstance(), getClient(), getLowLevelClient(), getProductClusterClient(), getSDKClusterClient());
137+
this(getGraphInstance(), getClient(), getLowLevelClient(), getProductClusterClient(), getNonProductSearchClusterClient());
138138
}
139139

140-
public AtlasJanusGraph(JanusGraph graphInstance, RestHighLevelClient elasticsearchClient, RestClient restClient,RestClient esProductClusterClient, RestClient esSDKClusterClient ) {
140+
public AtlasJanusGraph(JanusGraph graphInstance, RestHighLevelClient elasticsearchClient, RestClient restClient,RestClient esProductClusterClient, RestClient esNonProductClusterClient) {
141141
//determine multi-properties once at startup
142142
JanusGraphManagement mgmt = null;
143143

@@ -161,7 +161,7 @@ public AtlasJanusGraph(JanusGraph graphInstance, RestHighLevelClient elasticsear
161161
this.restClient = restClient;
162162
this.elasticsearchClient = elasticsearchClient;
163163
this.esProductClusterClient = esProductClusterClient;
164-
this.esSDKClusterClient = esSDKClusterClient;
164+
this.esNonProductClusterClient = esNonProductClusterClient;
165165
}
166166

167167
@Override
@@ -333,7 +333,7 @@ public AtlasIndexQuery<AtlasJanusVertex, AtlasJanusEdge> elasticsearchQuery(Stri
333333
LOG.error("restClient is not initiated, failed to run query on ES");
334334
throw new AtlasBaseException(INDEX_SEARCH_FAILED, "restClient is not initiated");
335335
}
336-
return new AtlasElasticsearchQuery(this, restClient, INDEX_PREFIX + indexName, searchParams, esProductClusterClient, esSDKClusterClient);
336+
return new AtlasElasticsearchQuery(this, restClient, INDEX_PREFIX + indexName, searchParams, esProductClusterClient, esNonProductClusterClient);
337337
}
338338

339339
@Override
@@ -389,7 +389,7 @@ public AtlasIndexQuery elasticsearchQuery(String indexName) throws AtlasBaseExce
389389
LOG.error("restClient is not initiated, failed to run query on ES");
390390
throw new AtlasBaseException(INDEX_SEARCH_FAILED, "restClient is not initiated");
391391
}
392-
return new AtlasElasticsearchQuery(this, indexName, restClient, esProductClusterClient, esSDKClusterClient);
392+
return new AtlasElasticsearchQuery(this, indexName, restClient, esProductClusterClient, esNonProductClusterClient);
393393
}
394394

395395
@Override

‎graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getClient;
5959
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getLowLevelClient;
6060
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getProductClusterClient;
61-
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getSDKClusterClient;
61+
import static org.apache.atlas.repository.graphdb.janus.AtlasElasticsearchDatabase.getNonProductSearchClusterClient;
6262

6363

6464
import static org.apache.atlas.ApplicationProperties.DEFAULT_INDEX_RECOVERY;
@@ -357,7 +357,7 @@ public AtlasGraph<AtlasJanusVertex, AtlasJanusEdge> getGraph() {
357357

358358
@Override
359359
public AtlasGraph<AtlasJanusVertex, AtlasJanusEdge> getGraphBulkLoading() {
360-
return new AtlasJanusGraph(getBulkLoadingGraphInstance(), getClient(), getLowLevelClient(), getProductClusterClient(), getSDKClusterClient());
360+
return new AtlasJanusGraph(getBulkLoadingGraphInstance(), getClient(), getLowLevelClient(), getProductClusterClient(), getNonProductSearchClusterClient());
361361
}
362362

363363
private static void startEmbeddedSolr() throws AtlasException {

‎intg/src/main/java/org/apache/atlas/AtlasConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public enum AtlasConfiguration {
118118
ATLAS_INDEXSEARCH_LIMIT_UTM_TAGS("atlas.indexsearch.limit.ignore.utm.tags", ""),
119119
ATLAS_INDEXSEARCH_ENABLE_REQUEST_ISOLATION("atlas.indexsearch.request.isolation.enable", false),
120120
ATLAS_ELASTICSEARCH_PRODUCT_SEARCH_CLUSTER_URL("atlas.index.elasticsearch.product.cluster.url","atlas-elasticsearch2-product-search-headless.atlas.svc.cluster.local:9200"),
121-
ATLAS_ELASTICSEARCH_SDK_SEARCH_CLUSTER_URL("atlas.index.elasticsearch.sdk.cluster.url","atlas-elasticsearch2-sdk-search-headless.atlas.svc.cluster.local:9200"),
121+
ATLAS_ELASTICSEARCH_NON_PRODUCT_SEARCH_CLUSTER_URL("atlas.index.elasticsearch.nonproduct.cluster.url","atlas-elasticsearch2-non-product-search-headless.atlas.svc.cluster.local:9200"),
122122
ATLAS_INDEXSEARCH_ENABLE_API_LIMIT("atlas.indexsearch.enable.api.limit", false),
123123
ATLAS_INDEXSEARCH_ENABLE_JANUS_OPTIMISATION("atlas.indexsearch.enable.janus.optimization", false),
124124
ATLAS_MAINTENANCE_MODE("atlas.maintenance.mode", false),

0 commit comments

Comments
 (0)