avoid printing contention error

googleapis · Oct 13, 2015 · cf46337 · cf46337
1 parent 33ddb90
commit cf46337
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java
@@ -84,6 +84,9 @@ public class LocalGcdHelper {
   private static final String GCLOUD = "gcloud";
   private static final Path INSTALLED_GCD_PATH;
   private static final String GCD_VERSION_PREFIX = "gcd-emulator ";
+  private static final String CONTENTION_ERROR_MESSAGE =
+      "com.google.apphosting.client.serviceapp.RpcException: " +
+          "too much contention on these datastore entities. please try again.";
 
   static {
     INSTALLED_GCD_PATH = installedGcdPath();
@@ -223,8 +226,11 @@ public void run() {
             if (errorOutput == null) {
               errorReaderDone = true;
             } else {
-              if (errorOutput.startsWith("SEVERE")) {
-                System.err.println(errorOutput);
+              if (errorOutput.startsWith("INFO:")
+                  || errorOutput.startsWith("com.google.apphosting.client.serviceapp")) {
+                if (!errorOutput.startsWith(CONTENTION_ERROR_MESSAGE)) {
+                  System.err.println(errorOutput);
+                }
               }
             }
           }