[Windows] Ignore disk I/O counters for drives that are not accessible

Signed-off-by: Pablo Baeyens <[email protected]>
giampaolo · Oct 19, 2021 · 5b8e9c2 · 5b8e9c2
1 parent d1cce5c
commit 5b8e9c2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CREDITS b/CREDITS
@@ -761,7 +761,7 @@ D: fix typos in documentation
 
 N: Pablo Baeyens
 W: https://github.com/mx-psi
-I: 1598
+I: 1598, 1974
 
 N: Xuehai Pan
 W: https://github.com/XuehaiPan

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -50,6 +50,7 @@ XXXX-XX-XX
   by PetrPospisil)
 - 1991_: process_iter() can raise TypeError if invoked from multiple threads
   (not thread-safe).
+- 1974_: [Windows] psutil.disk_io_counters() raises permission error.
 
 5.8.0
 =====

diff --git a/psutil/arch/windows/disk.c b/psutil/arch/windows/disk.c
@@ -140,6 +140,12 @@ psutil_disk_io_counters(PyObject *self, PyObject *args) {
                              "ignore PhysicalDrive%i", devNum);
                 goto next;
             }
+            else if (GetLastError() == ERROR_ACCESS_DENIED) {
+                // Ignore disks that we are not able to access.
+                psutil_debug("DeviceIoControl -> ERROR_ACCESS_DENIED; "
+                             "ignore PhysicalDrive%i", devNum);
+                goto next;
+            }
             // XXX: it seems we should also catch ERROR_INVALID_PARAMETER:
             // https://sites.ualberta.ca/dept/aict/uts/software/openbsd/
             //     ports/4.1/i386/openafs/w-openafs-1.4.14-transarc/