pr comment

pongad · pongad · commit 5378b396cf1e · 2017-03-30T14:18:26.000+11:00
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
@@ -125,7 +125,7 @@ public class LoggingHandler extends Handler {
   // https://github.com/GoogleCloudPlatform/google-cloud-java/issues/1740 .
   private final Level baseLevel;
 
-  private final Lock writeLock = new ReentrantLock();
+  private final Object writeLock = new Object();
   private final Set<ApiFuture<Void>> pendingWrites =
       Collections.newSetFromMap(new IdentityHashMap<ApiFuture<Void>, Boolean>());
 
@@ -473,25 +473,23 @@ void write(LogEntry entry, WriteOption... options) {
       case ASYNC:
       default:
         final ApiFuture<Void> writeFuture = getLogging().writeAsync(entryList, options);
-        writeLock.lock();
-        try {
+        synchronized(writeLock) {
           pendingWrites.add(writeFuture);
-        } finally {
-          writeLock.unlock();
         }
         ApiFutures.addCallback(
             writeFuture,
             new ApiFutureCallback<Void>() {
-              @Override
-              public void onSuccess(Void v) {
-                writeLock.lock();
-                try {
+              private void removeFromPending() {
+                synchronized(writeLock) {
                   pendingWrites.remove(writeFuture);
-                } finally {
-                  writeLock.unlock();
                 }
               }
 
+              @Override
+              public void onSuccess(Void v) {
+                removeFromPending();
+              }
+
               @Override
               public void onFailure(Throwable t) {
                 try {
@@ -501,7 +499,7 @@ public void onFailure(Throwable t) {
                     reportError(null, new Exception(t), ErrorManager.FLUSH_FAILURE);
                   }
                 } finally {
-                  onSuccess(null);
+                  removeFromPending();
                 }
               }
             });
@@ -511,16 +509,14 @@ public void onFailure(Throwable t) {
 
   @Override
   public void flush() {
-    // BUG(1795): flush is broken, need support from batching implementation.
+    // BUG(1795): We should force batcher to issue RPC call for buffered messages,
+    // so the code below doesn't wait uselessly.
 
-    ArrayList<ApiFuture<Void>> writes = new ArrayList<>();
-    writeLock.lock();
-    try {
-      writes.addAll(pendingWrites);
-    } finally {
-      writeLock.unlock();
+    ArrayList<ApiFuture<Void>> writesToFlush = new ArrayList<>();
+    synchronized(writeLock) {
+      writesToFlush.addAll(pendingWrites);
     }
-    for (ApiFuture<Void> write : writes) {
+    for (ApiFuture<Void> write : writesToFlush) {
       try {
         Uninterruptibles.getUninterruptibly(write);
       } catch (Exception e) {
