Merge pull request Azure#10328 from wastoresh/filehandle_fix

[Storage] Skip File/FileDir check when deal with file handle - Master

Author: wyunchi-ms

src/Storage/Storage.Management/ChangeLog.md

@@ -21,6 +21,9 @@
 * Support enable Large File share when create or update Storage account
     -  New-AzStorageAccount
     -  Set-AzStorageAccount
+* When close/get File handle, skip check the input path is File directory or File, to avoid failure with object in DeletePending status
+    -  Get-AzStorageFileHandle
+    -  Close-AzStorageFileHandle
 
 ## Version 1.8.0
 * Upgrade Storage Client Library to 11.1.0

src/Storage/Storage/File/Cmdlet/CloseAzureStorageFileHandle.cs

@@ -213,24 +213,9 @@ public override void ExecuteCmdlet()
                         string[] subfolders = NamingUtil.ValidatePath(this.Path);
                         targetDir = baseDirectory.GetDirectoryReferenceByPath(subfolders);
 
-                        if (!targetDir.Exists())
-                        {
-                            foundAFolder = false;
-                        }
-
-                        if (!foundAFolder)
-                        {
-                            //Get file
-                            string[] filePath = NamingUtil.ValidatePath(this.Path, true);
-                            targetFile = baseDirectory.GetFileReferenceByPath(filePath);
-
-                            this.Channel.FetchFileAttributesAsync(
-                                targetFile,
-                                null,
-                                this.RequestOptions,
-                                this.OperationContext,
-                                this.CmdletCancellationToken).ConfigureAwait(false);
-                        }
+                        // Don't need check the path target to File or FileDir since: 
+                        // 1. check File/FileDir exist will fail on File/FileDir with DeletePending status
+                        // 2. The File handle request send with CloudFileDirectory and CloudFile are same with same path, so need to differ it.
                     }
                 }
 

src/Storage/Storage/File/Cmdlet/GetAzureStorageFileHandle.cs

@@ -119,24 +119,9 @@ public override void ExecuteCmdlet()
                     string[] subfolders = NamingUtil.ValidatePath(this.Path);
                     targetDir = baseDirectory.GetDirectoryReferenceByPath(subfolders);
 
-                    if (!targetDir.Exists())
-                    {
-                        foundAFolder = false;
-                    }
-
-                    if (!foundAFolder)
-                    {
-                        //Get file
-                        string[] filePath = NamingUtil.ValidatePath(this.Path, true);
-                        targetFile = baseDirectory.GetFileReferenceByPath(filePath);
-
-                        this.Channel.FetchFileAttributesAsync(
-                            targetFile,
-                            null,
-                            this.RequestOptions,
-                            this.OperationContext,
-                            this.CmdletCancellationToken).ConfigureAwait(false);
-                    }
+                    // Don't need check the path target to File or FileDir since: 
+                    // 1. check File/FileDir exist will fail on File/FileDir with DeletePending status
+                    // 2. The File handle request send with CloudFileDirectory and CloudFile are same with same path, so need to differ it.
                 }
             }