Skip to content

Commit cd222aa

Browse files
committed
cleaning up comments/ logs, modified extensionsInitialized to be asyncronous since APIs will be utlizing the extensionsInitializedList to identify the correct node to send requests to. Since arraylists are not thread safe, this is achieved by adding countdown latches
Signed-off-by: Joshua Palis <jpalis@amazon.com>
1 parent 39ab25c commit cd222aa

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

server/src/main/java/org/opensearch/extensions/ExtensionNamedWriteableRegistry.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ public ExtensionNamedWriteableRegistry(List<DiscoveryExtension> extensionsInitia
5151
* Iterates through all discovered extensions, sends transport requests for named writeables and consolidates all entires into a central named writeable registry for extensions.
5252
*/
5353
public void getNamedWriteables() {
54-
55-
logger.info("Hit get Named Writeables");
56-
logger.info("initialized extensions : " + extensionsInitializedList.toString());
5754
// Retrieve named writeable registry entries from each extension
5855
for (DiscoveryNode extensionNode : extensionsInitializedList) {
5956
try {
@@ -79,7 +76,6 @@ public void getNamedWriteables() {
7976
*/
8077
private Map<DiscoveryNode, Map<Class, Map<String, ExtensionReader>>> getNamedWriteables(DiscoveryNode extensionNode)
8178
throws UnknownHostException {
82-
logger.info("Inside get named writeables( discovery node)");
8379
NamedWriteableRegistryResponseHandler namedWriteableRegistryResponseHandler = new NamedWriteableRegistryResponseHandler(
8480
extensionNode,
8581
transportService,

server/src/main/java/org/opensearch/extensions/ExtensionsOrchestrator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public void extensionsInitialize() {
228228
}
229229

230230
private void extensionInitialize(DiscoveryNode extensionNode) {
231-
231+
final CountDownLatch inProgressLatch = new CountDownLatch(1);
232232
final TransportResponseHandler<PluginResponse> pluginResponseHandler = new TransportResponseHandler<PluginResponse>() {
233233

234234
@Override
@@ -244,11 +244,13 @@ public void handleResponse(PluginResponse response) {
244244
break;
245245
}
246246
}
247+
inProgressLatch.countDown();
247248
}
248249

249250
@Override
250251
public void handleException(TransportException exp) {
251252
logger.debug(new ParameterizedMessage("Plugin request failed"), exp);
253+
inProgressLatch.countDown();
252254
}
253255

254256
@Override
@@ -265,6 +267,7 @@ public String executor() {
265267
new PluginRequest(transportService.getLocalNode(), new ArrayList<DiscoveryExtension>(extensionsList)),
266268
pluginResponseHandler
267269
);
270+
inProgressLatch.await(100, TimeUnit.SECONDS);
268271
} catch (Exception e) {
269272
logger.error(e.toString());
270273
}

server/src/main/java/org/opensearch/extensions/NamedWriteableRegistryResponseHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ public void handleResponse(NamedWriteableRegistryResponse response) {
104104
Map<String, ExtensionReader> readers = null;
105105
Class currentCategory = null;
106106

107-
// Extract response entries and process fully qualified class name into category class instance
108107
for (Map.Entry<String, Class> entry : response.getRegistry().entrySet()) {
109108

110109
String name = entry.getKey();

0 commit comments

Comments
 (0)