fix the "invalid handle" error reporting when httpconnector flag is on. The change now always uses the clone security ticket instead of the request based ticket, so that datastore API can happen even just after a request is committed.

PiperOrigin-RevId: 827137779
Change-Id: Icd1bcd120545e9f39e0be1b1d2a767a63d022494

Author: ludoch

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/http/HttpApiHostClient.java

@@ -16,8 +16,6 @@
 
 package com.google.apphosting.runtime.http;
 
-import static com.google.apphosting.runtime.AppEngineConstants.HTTP_CONNECTOR_MODE;
-
 import com.google.apphosting.base.protos.RuntimePb.APIRequest;
 import com.google.apphosting.base.protos.RuntimePb.APIResponse;
 import com.google.apphosting.base.protos.RuntimePb.APIResponse.ERROR;
@@ -254,22 +252,13 @@ public void call(AnyRpcClientContext ctx, APIRequest req, AnyRpcCallback<APIResp
       requestTooBig(cb);
       return;
     }
-    RemoteApiPb.Request requestPb =
-        req.getApiPackage().startsWith("datastore") && Boolean.getBoolean(HTTP_CONNECTOR_MODE)
-            ? RemoteApiPb.Request.newBuilder()
-                .setServiceName(req.getApiPackage())
-                .setMethod(req.getCall())
-                .setRequest(payload)
-                // No request ID security ticket for HTTP connector mode.
-                .setTraceContext(req.getTraceContext().toByteString())
-                .build()
-            : RemoteApiPb.Request.newBuilder()
-                .setServiceName(req.getApiPackage())
-                .setMethod(req.getCall())
-                .setRequest(payload)
-                .setRequestId(req.getSecurityTicket())
-                .setTraceContext(req.getTraceContext().toByteString())
-                .build();
+    RemoteApiPb.Request requestPb = RemoteApiPb.Request.newBuilder()
+        .setServiceName(req.getApiPackage())
+        .setMethod(req.getCall())
+        .setRequest(payload)
+        .setRequestId(req.getSecurityTicket())
+        .setTraceContext(req.getTraceContext().toByteString())
+        .build();
     send(requestPb.toByteArray(), context, cb);
   }
 

runtime/runtime_impl_jetty121/src/main/java/com/google/apphosting/runtime/http/HttpApiHostClient.java

@@ -16,8 +16,6 @@
 
 package com.google.apphosting.runtime.http;
 
-import static com.google.apphosting.runtime.AppEngineConstants.HTTP_CONNECTOR_MODE;
-
 import com.google.apphosting.base.protos.RuntimePb.APIRequest;
 import com.google.apphosting.base.protos.RuntimePb.APIResponse;
 import com.google.apphosting.base.protos.RuntimePb.APIResponse.ERROR;
@@ -259,21 +257,13 @@ public void call(AnyRpcClientContext ctx, APIRequest req, AnyRpcCallback<APIResp
       return;
     }
     RemoteApiPb.Request requestPb =
-        req.getApiPackage().startsWith("datastore") && Boolean.getBoolean(HTTP_CONNECTOR_MODE)
-            ? RemoteApiPb.Request.newBuilder()
-                .setServiceName(req.getApiPackage())
-                .setMethod(req.getCall())
-                .setRequest(payload)
-                // No request ID security ticket for HTTP connector mode.
-                .setTraceContext(req.getTraceContext().toByteString())
-                .build()
-            : RemoteApiPb.Request.newBuilder()
-                .setServiceName(req.getApiPackage())
-                .setMethod(req.getCall())
-                .setRequest(payload)
-                .setRequestId(req.getSecurityTicket())
-                .setTraceContext(req.getTraceContext().toByteString())
-                .build();
+        RemoteApiPb.Request.newBuilder()
+            .setServiceName(req.getApiPackage())
+            .setMethod(req.getCall())
+            .setRequest(payload)
+            .setRequestId(req.getSecurityTicket())
+            .setTraceContext(req.getTraceContext().toByteString())
+            .build();
     send(requestPb.toByteArray(), context, cb);
   }
 

runtime/runtime_impl_jetty9/src/main/java/com/google/apphosting/runtime/http/HttpApiHostClient.java

@@ -16,8 +16,6 @@
 
 package com.google.apphosting.runtime.http;
 
-import static com.google.apphosting.runtime.AppEngineConstants.HTTP_CONNECTOR_MODE;
-
 import com.google.apphosting.base.protos.RuntimePb.APIRequest;
 import com.google.apphosting.base.protos.RuntimePb.APIResponse;
 import com.google.apphosting.base.protos.RuntimePb.APIResponse.ERROR;
@@ -254,22 +252,13 @@ public void call(AnyRpcClientContext ctx, APIRequest req, AnyRpcCallback<APIResp
       requestTooBig(cb);
       return;
     }
-    RemoteApiPb.Request requestPb =
-        req.getApiPackage().startsWith("datastore") && Boolean.getBoolean(HTTP_CONNECTOR_MODE)
-            ? RemoteApiPb.Request.newBuilder()
-                .setServiceName(req.getApiPackage())
-                .setMethod(req.getCall())
-                .setRequest(payload)
-                // No request ID security ticket for HTTP connector mode.
-                .setTraceContext(req.getTraceContext().toByteString())
-                .build()
-            : RemoteApiPb.Request.newBuilder()
-                .setServiceName(req.getApiPackage())
-                .setMethod(req.getCall())
-                .setRequest(payload)
-                .setRequestId(req.getSecurityTicket())
-                .setTraceContext(req.getTraceContext().toByteString())
-                .build();
+    RemoteApiPb.Request requestPb = RemoteApiPb.Request.newBuilder()
+        .setServiceName(req.getApiPackage())
+        .setMethod(req.getCall())
+        .setRequest(payload)
+        .setRequestId(req.getSecurityTicket())
+        .setTraceContext(req.getTraceContext().toByteString())
+        .build();
     send(requestPb.toByteArray(), context, cb);
   }