Merge pull request #9248 from jackyalbo/jacky-nc-5.20-fixes

[5.20 backport] NC | 5.20 fixes

Author: nimrod-becker

config.js

@@ -1000,6 +1000,8 @@ config.NFSF_UPLOAD_STREAM_MEM_THRESHOLD = 8 * 1024 * 1024;
 
 // we want to change our handling related to EACCESS error
 config.NSFS_LIST_IGNORE_ENTRY_ON_EACCES = true;
+// we will for now handle the same way also EINVAL error - for gpfs stat issues on list (.snapshots)
+config.NSFS_LIST_IGNORE_ENTRY_ON_EINVAL = true;
 
 ////////////////////////////
 // NSFS NON CONTAINERIZED //

src/sdk/namespace_fs.js

@@ -737,18 +737,16 @@ class NamespaceFS {
                     if (!delimiter && r.common_prefix) {
                         await process_dir(r.key);
                     } else {
-                        if (!r.common_prefix) {
-                            const entry_path = path.join(this.bucket_path, r.key);
-                            // If entry is outside of bucket, returns stat of symbolic link
-                            const use_lstat = !(await this._is_path_in_bucket_boundaries(fs_context, entry_path));
-                            const stat = await native_fs_utils.stat_if_exists(fs_context, entry_path,
-                                use_lstat, config.NSFS_LIST_IGNORE_ENTRY_ON_EACCES);
-                            // TODO - GAP of .folder files - we return stat of the directory for the 
-                            // xattr, but the creation time should be of the .folder files (and maybe more )
-                            if (stat) r.stat = stat;
-                        }
-                        // add the result only if we have the stat information or a directory
-                        if (r.stat || r.common_prefix) {
+                        const entry_path = path.join(this.bucket_path, r.key);
+                        // If entry is outside of bucket, returns stat of symbolic link
+                        const use_lstat = !(await this._is_path_in_bucket_boundaries(fs_context, entry_path));
+                        const stat = await native_fs_utils.stat_if_exists(fs_context, entry_path,
+                            use_lstat, config.NSFS_LIST_IGNORE_ENTRY_ON_EACCES);
+                        // TODO - GAP of .folder files - we return stat of the directory for the 
+                        // xattr, but the creation time should be of the .folder files (and maybe more )
+                        if (stat) {
+                            r.stat = stat;
+                            // add the result only if we have the stat information
                             if (pos < results.length) {
                                 results.splice(pos, 0, r);
                             } else {

src/util/native_fs_utils.js

@@ -318,6 +318,8 @@ async function stat_if_exists(fs_context, entry_path, use_lstat, should_ignore_e
         // we might want to expand the error list due to permission/structure
         // change (for example: ELOOP, ENAMETOOLONG) or other reason (EPERM) - need to be decided
         if ((err.code === 'EACCES' && should_ignore_eacces) ||
+            // A fix for GPFS stat issues on list (.snapshots) - ignore EINVAL as well
+            (err.code === 'EINVAL' && config.NSFS_LIST_IGNORE_ENTRY_ON_EINVAL) ||
             err.code === 'ENOENT' || err.code === 'ENOTDIR') {
             dbg.log0('stat_if_exists: Could not access file entry_path',
                 entry_path, 'error code', err.code, ', skipping...');