Remove BaseShardResponse as it'll be pushed later

Signed-off-by: Aman Khare <[email protected]>
opensearch-project · Mar 14, 2024 · 776f625 · 776f625
1 parent 85faccc
commit 776f625
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 63 deletions.
diff --git a/server/src/main/java/org/opensearch/gateway/BaseShardResponse.java b/server/src/main/java/org/opensearch/gateway/BaseShardResponse.java
diff --git a/...src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadataBatch.java b/...src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadataBatch.java
@@ -27,7 +27,6 @@
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.env.NodeEnvironment;
 import org.opensearch.gateway.AsyncShardFetch;
-import org.opensearch.gateway.BaseShardResponse;
 import org.opensearch.index.store.Store;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.indices.store.TransportNodesListShardStoreMetadataHelper.StoreFilesMetadata;
@@ -239,43 +238,48 @@ protected void writeNodesTo(StreamOutput out, List<NodeStoreFilesMetadataBatch>
      *
      * @opensearch.internal
      */
-    public static class NodeStoreFilesMetadata extends BaseShardResponse {
+    public static class NodeStoreFilesMetadata {
 
         private StoreFilesMetadata storeFilesMetadata;
+        private Exception storeFileFetchException;
 
-        @Override
-        public boolean isEmpty() {
-            return storeFilesMetadata == null || storeFilesMetadata().isEmpty() && getException() == null;
+        public NodeStoreFilesMetadata(StoreFilesMetadata storeFilesMetadata) {
+            this.storeFilesMetadata = storeFilesMetadata;
+            this.storeFileFetchException = null;
         }
 
         public NodeStoreFilesMetadata(StreamInput in) throws IOException {
-            super(in);
+            storeFilesMetadata = new StoreFilesMetadata(in);
             if (in.readBoolean()) {
-                this.storeFilesMetadata = new StoreFilesMetadata(in);
+                this.storeFileFetchException = in.readException();
             } else {
-                this.storeFilesMetadata = null;
+                this.storeFileFetchException = null;
             }
         }
 
         public NodeStoreFilesMetadata(StoreFilesMetadata storeFilesMetadata, Exception storeFileFetchException) {
-            super(storeFileFetchException);
             this.storeFilesMetadata = storeFilesMetadata;
+            this.storeFileFetchException = storeFileFetchException;
         }
 
         public StoreFilesMetadata storeFilesMetadata() {
             return storeFilesMetadata;
         }
 
         public void writeTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            if (storeFilesMetadata != null) {
+            storeFilesMetadata.writeTo(out);
+            if (storeFileFetchException != null) {
                 out.writeBoolean(true);
-                storeFilesMetadata.writeTo(out);
+                out.writeException(storeFileFetchException);
             } else {
                 out.writeBoolean(false);
             }
         }
 
+        public Exception getStoreFileFetchException() {
+            return storeFileFetchException;
+        }
+
         @Override
         public String toString() {
             return "[[" + storeFilesMetadata + "]]";