Ensure notify when proxy connections disconnect (#65697)

dnhatn · dnhatn · commit 04d7f6bd7263 · 2020-12-03T17:03:34.000-05:00
TransportService doesn't respond to the pending requests of proxy
connections when the underlying connections get disconnected because
proxy connections do not override the getCacheKey method. Some CCS
requests would never be completed because of this bug.
diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java
@@ -371,6 +371,11 @@ public boolean isClosed() {
         public Version getVersion() {
             return proxyConnection.getVersion();
         }
+
+        @Override
+        public Object getCacheKey() {
+            return proxyConnection.getCacheKey();
+        }
     }
 
     Transport.Connection getConnection() {

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,11 @@ public boolean isClosed() {`
`371`	`371`	`public Version getVersion() {`
`372`	`372`	`return proxyConnection.getVersion();`
`373`	`373`	`}`
	`374`	`+`
	`375`	`+ @Override`
	`376`	`+ public Object getCacheKey() {`
	`377`	`+ return proxyConnection.getCacheKey();`
	`378`	`+ }`
`374`	`379`	`}`
`375`	`380`
`376`	`381`	`Transport.Connection getConnection() {`