Update getDataSourceMetadata to get for initial state

acarbonetto · acarbonetto · commit 629d90045039 · 2023-08-22T09:33:09.000-07:00
Signed-off-by: acarbonetto &lt;andrewc@bitquilltech.com&gt;
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java b/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java
@@ -80,7 +80,7 @@ public OpenSearchDataSourceMetadataStorage(
 
   @Override
   public List<DataSourceMetadata> getDataSourceMetadata() {
-    if (this.clusterService.state() == null) {
+    if (!this.clusterService.getClusterApplierService().isInitialClusterStateSet()) {
       return Collections.emptyList();
     }
     if (!this.clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME)) {

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public OpenSearchDataSourceMetadataStorage(`
`80`	`80`
`81`	`81`	`@Override`
`82`	`82`	`public List<DataSourceMetadata> getDataSourceMetadata() {`
`83`		`- if (this.clusterService.state() == null) {`
	`83`	`+ if (!this.clusterService.getClusterApplierService().isInitialClusterStateSet()) {`
`84`	`84`	`return Collections.emptyList();`
`85`	`85`	`}`
`86`	`86`	`if (!this.clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME)) {`