From 222f93e8166ed73be3afeb1a656ff5007b82e525 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Wed, 17 Jun 2020 14:59:43 -0700
Subject: [PATCH] possibly fix concurrent access to entry object in
 SeaweedOutputStream

---
 LICENSE                                       |  2 +-
 .../java/seaweedfs/client/SeaweedWrite.java   | 34 +++++++++++--------
 .../seaweed/hdfs/SeaweedOutputStream.java     |  3 --
 .../seaweed/hdfs/SeaweedOutputStream.java     |  3 --
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/LICENSE b/LICENSE
index 735f67b68..abdba6d60 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-                                 Apache License
+g                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java
index dc6203e52..18ec77b76 100644
--- a/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java
+++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java
@@ -45,28 +45,32 @@ public class SeaweedWrite {
 
         String etag = multipartUpload(targetUrl, auth, bytes, bytesOffset, bytesLength, cipherKey);
 
+        synchronized (entry) {
+            entry.addChunks(FilerProto.FileChunk.newBuilder()
+                    .setFileId(fileId)
+                    .setOffset(offset)
+                    .setSize(bytesLength)
+                    .setMtime(System.currentTimeMillis() / 10000L)
+                    .setETag(etag)
+                    .setCipherKey(cipherKeyString)
+            );
+        }
+
         // cache fileId ~ bytes
         SeaweedRead.chunkCache.setChunk(fileId, bytes);
 
-        entry.addChunks(FilerProto.FileChunk.newBuilder()
-                .setFileId(fileId)
-                .setOffset(offset)
-                .setSize(bytesLength)
-                .setMtime(System.currentTimeMillis() / 10000L)
-                .setETag(etag)
-                .setCipherKey(cipherKeyString)
-        );
-
     }
 
     public static void writeMeta(final FilerGrpcClient filerGrpcClient,
                                  final String parentDirectory, final FilerProto.Entry.Builder entry) {
-        filerGrpcClient.getBlockingStub().createEntry(
-                FilerProto.CreateEntryRequest.newBuilder()
-                        .setDirectory(parentDirectory)
-                        .setEntry(entry)
-                        .build()
-        );
+        synchronized (entry){
+            filerGrpcClient.getBlockingStub().createEntry(
+                    FilerProto.CreateEntryRequest.newBuilder()
+                            .setDirectory(parentDirectory)
+                            .setEntry(entry)
+                            .build()
+            );
+        }
     }
 
     private static String multipartUpload(String targetUrl,
diff --git a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedOutputStream.java b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedOutputStream.java
index 7b488a5da..e08843caa 100644
--- a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedOutputStream.java
+++ b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedOutputStream.java
@@ -69,9 +69,6 @@ public class SeaweedOutputStream extends OutputStream {
     }
 
     private synchronized void flushWrittenBytesToServiceInternal(final long offset) throws IOException {
-
-        LOG.debug("SeaweedWrite.writeMeta path: {} entry:{}", path, entry);
-
         try {
             SeaweedWrite.writeMeta(filerGrpcClient, getParentDirectory(path), entry);
         } catch (Exception ex) {
diff --git a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedOutputStream.java b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedOutputStream.java
index 4f307ff96..96af27fe0 100644
--- a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedOutputStream.java
+++ b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedOutputStream.java
@@ -78,9 +78,6 @@ public class SeaweedOutputStream extends OutputStream implements Syncable, Strea
     }
 
     private synchronized void flushWrittenBytesToServiceInternal(final long offset) throws IOException {
-
-        LOG.debug("SeaweedWrite.writeMeta path: {} entry:{}", path, entry);
-
         try {
             SeaweedWrite.writeMeta(filerGrpcClient, getParentDirectory(path), entry);
         } catch (Exception ex) {