namespace: mv workaround, allow mv between direcrories having none st…

…orageclass
DmitryLitvintsev · Oct 15, 2024 · bdc323f · bdc323f
1 parent 72e9d6e
commit bdc323f
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/...s/dcache-chimera/src/main/java/org/dcache/chimera/namespace/ChimeraNameSpaceProvider.java b/...s/dcache-chimera/src/main/java/org/dcache/chimera/namespace/ChimeraNameSpaceProvider.java
@@ -678,13 +678,22 @@ public void rename(Subject subject, @Nullable PnfsId pnfsId,
                             sourceAttributes =
                                   getFileAttributes(new ExtendedInode(_fs, inode), attributes);
                         }
-                        if (!(nullToEmpty(destDirAttributes.getStorageClass()).
-                              equals(nullToEmpty(sourceAttributes.getStorageClass())) &&
-                              nullToEmpty(destDirAttributes.getCacheClass()).
-                                    equals(nullToEmpty(sourceAttributes.getCacheClass())))) {
-                            throw new PermissionDeniedCacheException("Mv denied: " +
-                                  dest.getParent() +
-                                  " has different storage tags; use cp.");
+                        String destStorageClass = nullToEmpty(destDirAttributes.getStorageClass());
+                        String srcStorageClass  = nullToEmpty(sourceAttributes.getStorageClass());
+
+                        if (!srcStorageClass.equals("none.none") &&
+                            !destStorageClass.equals("none.none") &&
+                            !srcStorageClass.equals("") &&
+                            !destStorageClass.equals("")) {
+
+                            if (!(nullToEmpty(destDirAttributes.getStorageClass()).
+                                  equals(nullToEmpty(sourceAttributes.getStorageClass())) &&
+                                  nullToEmpty(destDirAttributes.getCacheClass()).
+                                  equals(nullToEmpty(sourceAttributes.getCacheClass())))) {
+                                throw new PermissionDeniedCacheException("Mv denied: " +
+                                                                         dest.getParent() +
+                                                                         " has different storage tags; use cp.");
+                            }
                         }
                     }
                 }