You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cm...@apache.org on 2014/07/09 21:29:26 UTC

svn commit: r1609276 - in /hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native: jni/jnifs.c ndfs/ndfs.c

Author: cmccabe
Date: Wed Jul  9 19:29:26 2014
New Revision: 1609276

URL: http://svn.apache.org/r1609276
Log:
HADOOP-10805. ndfs hdfsDelete should check the return boolean (cmccabe)

Modified:
    hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/jni/jnifs.c
    hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/ndfs/ndfs.c

Modified: hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/jni/jnifs.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/jni/jnifs.c?rev=1609276&r1=1609275&r2=1609276&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/jni/jnifs.c (original)
+++ hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/jni/jnifs.c Wed Jul  9 19:29:26 2014
@@ -1382,7 +1382,7 @@ static int jni_unlink(hdfsFS bfs, const 
         return -1;
     }
     if (!jVal.z) {
-        errno = EIO;
+        errno = ENOENT;
         return -1;
     }
     return 0;

Modified: hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/ndfs/ndfs.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/ndfs/ndfs.c?rev=1609276&r1=1609275&r2=1609276&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/ndfs/ndfs.c (original)
+++ hadoop/common/branches/HADOOP-10388/hadoop-native-core/src/main/native/ndfs/ndfs.c Wed Jul  9 19:29:26 2014
@@ -593,6 +593,11 @@ static int ndfs_unlink(struct hdfs_inter
     if (err) {
         goto done;
     }
+    if (resp->result == 0) {
+        err = hadoop_lerr_alloc(ENOENT, "ndfs_unlink(%s, recursive=%d): "
+                    "deletion failed on the server", uri, recursive);
+        goto done;
+    }
 
 done:
     free(path);