From 8e2f3b510e9c33a73f9eaf0f334e5fa1a8578354 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sat, 10 Oct 2020 15:43:04 -0700
Subject: Hadoop client: 1.4.9

---
 other/java/client/pom.xml                   | 2 +-
 other/java/client/pom.xml.deploy            | 2 +-
 other/java/client/pom_debug.xml             | 2 +-
 other/java/hdfs2/dependency-reduced-pom.xml | 2 +-
 other/java/hdfs2/pom.xml                    | 2 +-
 other/java/hdfs3/dependency-reduced-pom.xml | 2 +-
 other/java/hdfs3/pom.xml                    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'other/java')

diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml
index ad9145155..01ac3dcfc 100644
--- a/other/java/client/pom.xml
+++ b/other/java/client/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.chrislusf</groupId>
     <artifactId>seaweedfs-client</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
 
     <parent>
         <groupId>org.sonatype.oss</groupId>
diff --git a/other/java/client/pom.xml.deploy b/other/java/client/pom.xml.deploy
index ad9145155..01ac3dcfc 100644
--- a/other/java/client/pom.xml.deploy
+++ b/other/java/client/pom.xml.deploy
@@ -5,7 +5,7 @@
 
     <groupId>com.github.chrislusf</groupId>
     <artifactId>seaweedfs-client</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
 
     <parent>
         <groupId>org.sonatype.oss</groupId>
diff --git a/other/java/client/pom_debug.xml b/other/java/client/pom_debug.xml
index 55aa56e8b..14281f7a3 100644
--- a/other/java/client/pom_debug.xml
+++ b/other/java/client/pom_debug.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.chrislusf</groupId>
     <artifactId>seaweedfs-client</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
 
     <parent>
         <groupId>org.sonatype.oss</groupId>
diff --git a/other/java/hdfs2/dependency-reduced-pom.xml b/other/java/hdfs2/dependency-reduced-pom.xml
index e3b434b9b..966abd1c7 100644
--- a/other/java/hdfs2/dependency-reduced-pom.xml
+++ b/other/java/hdfs2/dependency-reduced-pom.xml
@@ -301,7 +301,7 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <seaweedfs.client.version>1.4.8</seaweedfs.client.version>
+    <seaweedfs.client.version>1.4.9</seaweedfs.client.version>
     <hadoop.version>2.9.2</hadoop.version>
   </properties>
 </project>
diff --git a/other/java/hdfs2/pom.xml b/other/java/hdfs2/pom.xml
index 595d070e8..ede70eea4 100644
--- a/other/java/hdfs2/pom.xml
+++ b/other/java/hdfs2/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <seaweedfs.client.version>1.4.8</seaweedfs.client.version>
+        <seaweedfs.client.version>1.4.9</seaweedfs.client.version>
         <hadoop.version>2.9.2</hadoop.version>
     </properties>
 
diff --git a/other/java/hdfs3/dependency-reduced-pom.xml b/other/java/hdfs3/dependency-reduced-pom.xml
index 46add89fe..9ac40b48b 100644
--- a/other/java/hdfs3/dependency-reduced-pom.xml
+++ b/other/java/hdfs3/dependency-reduced-pom.xml
@@ -309,7 +309,7 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <seaweedfs.client.version>1.4.8</seaweedfs.client.version>
+    <seaweedfs.client.version>1.4.9</seaweedfs.client.version>
     <hadoop.version>3.1.1</hadoop.version>
   </properties>
 </project>
diff --git a/other/java/hdfs3/pom.xml b/other/java/hdfs3/pom.xml
index 240c6eb41..d1a5d8e0f 100644
--- a/other/java/hdfs3/pom.xml
+++ b/other/java/hdfs3/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <seaweedfs.client.version>1.4.8</seaweedfs.client.version>
+        <seaweedfs.client.version>1.4.9</seaweedfs.client.version>
         <hadoop.version>3.1.1</hadoop.version>
     </properties>
 
-- 
cgit v1.2.3


From ea13e0523b6330bcd3a204fa3749db5a076ccad3 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sun, 11 Oct 2020 14:59:48 -0700
Subject: fix logging

---
 other/java/client/src/main/java/seaweedfs/client/FilerClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'other/java')

diff --git a/other/java/client/src/main/java/seaweedfs/client/FilerClient.java b/other/java/client/src/main/java/seaweedfs/client/FilerClient.java
index 468a95e28..ada099753 100644
--- a/other/java/client/src/main/java/seaweedfs/client/FilerClient.java
+++ b/other/java/client/src/main/java/seaweedfs/client/FilerClient.java
@@ -290,7 +290,7 @@ public class FilerClient {
                     .setEntry(entry)
                     .build());
         } catch (Exception e) {
-            LOG.warn("createEntry {}/{}: {}", parent, entry.getName(), e);
+            LOG.warn("updateEntry {}/{}: {}", parent, entry.getName(), e);
             return false;
         }
         return true;
-- 
cgit v1.2.3


From d5fcb0f474ac72389b89ba2d42adc4089b0f3e88 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sun, 11 Oct 2020 15:11:16 -0700
Subject: Hadoop: printout the entry creation error message

---
 .../client/src/main/java/seaweedfs/client/FilerClient.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'other/java')

diff --git a/other/java/client/src/main/java/seaweedfs/client/FilerClient.java b/other/java/client/src/main/java/seaweedfs/client/FilerClient.java
index ada099753..035b2c852 100644
--- a/other/java/client/src/main/java/seaweedfs/client/FilerClient.java
+++ b/other/java/client/src/main/java/seaweedfs/client/FilerClient.java
@@ -1,5 +1,6 @@
 package seaweedfs.client;
 
+import com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -272,15 +273,20 @@ public class FilerClient {
 
     public boolean createEntry(String parent, FilerProto.Entry entry) {
         try {
-            filerGrpcClient.getBlockingStub().createEntry(FilerProto.CreateEntryRequest.newBuilder()
+            FilerProto.CreateEntryResponse createEntryResponse =
+                    filerGrpcClient.getBlockingStub().createEntry(FilerProto.CreateEntryRequest.newBuilder()
                     .setDirectory(parent)
                     .setEntry(entry)
                     .build());
+            if (Strings.isNullOrEmpty(createEntryResponse.getError())) {
+                return true;
+            }
+            LOG.warn("createEntry {}/{} error: {}", parent, entry.getName(), createEntryResponse.getError());
+            return false;
         } catch (Exception e) {
             LOG.warn("createEntry {}/{}: {}", parent, entry.getName(), e);
             return false;
         }
-        return true;
     }
 
     public boolean updateEntry(String parent, FilerProto.Entry entry) {
-- 
cgit v1.2.3