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: 826192522
Change-Id: I5f46bc6e0d7cd0ad51e07314a19d61c77e86e4a8

Author: ludoch

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

@@ -16,6 +16,8 @@
 
 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;
@@ -252,13 +254,22 @@ public void call(AnyRpcClientContext ctx, APIRequest req, AnyRpcCallback<APIResp
       requestTooBig(cb);
       return;
     }
-    RemoteApiPb.Request requestPb = RemoteApiPb.Request.newBuilder()
-        .setServiceName(req.getApiPackage())
-        .setMethod(req.getCall())
-        .setRequest(payload)
-        .setRequestId(req.getSecurityTicket())
-        .setTraceContext(req.getTraceContext().toByteString())
-        .build();
+    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();
     send(requestPb.toByteArray(), context, cb);
   }
 

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

@@ -16,6 +16,8 @@
 
 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;
@@ -257,13 +259,21 @@ public void call(AnyRpcClientContext ctx, APIRequest req, AnyRpcCallback<APIResp
       return;
     }
     RemoteApiPb.Request requestPb =
-        RemoteApiPb.Request.newBuilder()
-            .setServiceName(req.getApiPackage())
-            .setMethod(req.getCall())
-            .setRequest(payload)
-            .setRequestId(req.getSecurityTicket())
-            .setTraceContext(req.getTraceContext().toByteString())
-            .build();
+        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();
     send(requestPb.toByteArray(), context, cb);
   }
 

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

@@ -16,6 +16,8 @@
 
 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;
@@ -252,13 +254,22 @@ public void call(AnyRpcClientContext ctx, APIRequest req, AnyRpcCallback<APIResp
       requestTooBig(cb);
       return;
     }
-    RemoteApiPb.Request requestPb = RemoteApiPb.Request.newBuilder()
-        .setServiceName(req.getApiPackage())
-        .setMethod(req.getCall())
-        .setRequest(payload)
-        .setRequestId(req.getSecurityTicket())
-        .setTraceContext(req.getTraceContext().toByteString())
-        .build();
+    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();
     send(requestPb.toByteArray(), context, cb);
   }