statbtrfs 0.28__tar.gz → 0.30__tar.gz

{statbtrfs-0.28 → statbtrfs-0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: statbtrfs
-Version: 0.28
+Version: 0.30
 Summary: Query Btrfs filesystem status
 Home-page: https://github.com/yufei-pan/statbtrfs
 Author: Yufei Pan
@@ -11,7 +11,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 or later (G
 Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.6
 Description-Content-Type: text/plain
-Requires-Dist: multiCMD>=1.40
+Requires-Dist: multiCMD>=1.47
 Requires-Dist: argparse
 Provides-Extra: completion
 Requires-Dist: argcomplete; extra == "completion"

{statbtrfs-0.28 → statbtrfs-0.30}/setup.py

@@ -17,7 +17,7 @@ setup(
         ],
     },
     install_requires=[
-		'multiCMD>=1.40',
+		'multiCMD>=1.47',
         'argparse',
     ],
     extras_require={

{statbtrfs-0.28 → statbtrfs-0.30}/statbtrfs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: statbtrfs
-Version: 0.28
+Version: 0.30
 Summary: Query Btrfs filesystem status
 Home-page: https://github.com/yufei-pan/statbtrfs
 Author: Yufei Pan
@@ -11,7 +11,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 or later (G
 Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.6
 Description-Content-Type: text/plain
-Requires-Dist: multiCMD>=1.40
+Requires-Dist: multiCMD>=1.47
 Requires-Dist: argparse
 Provides-Extra: completion
 Requires-Dist: argcomplete; extra == "completion"

{statbtrfs-0.28 → statbtrfs-0.30}/statbtrfs.egg-info/requires.txt

@@ -1,4 +1,4 @@
-multiCMD>=1.40
+multiCMD>=1.47
 argparse
 
 [completion]

{statbtrfs-0.28 → statbtrfs-0.30}/statbtrfs.py

@@ -5,10 +5,11 @@ import time
 import os
 import sys
 import fnmatch
+from datetime import datetime
 try:
 	import multiCMD  # type: ignore
-	assert float(multiCMD.version) >= 1.47
-except (ImportError, AssertionError):
+	assert tuple(int(part) for part in multiCMD.version.split('.')[:2]) >= (1, 47)
+except (ImportError, AssertionError, ValueError):
 	import sys,types,base64,lzma   # noqa: E401
 	multiCMD = types.ModuleType("multiCMD")
 	sys.modules["multiCMD"] = multiCMD
@@ -92,7 +93,7 @@ J%qnMk3G%Ki=s>n[1@,^@>j\8FEhN0`om\)D0qE:R`HqPJ4V2sGJQF,mfou/XJaY?rc[UV'\!tti]K/e
 3o1Z^c;DqS!6qW$2SYp!!/0?QbEJ#:7ZhqZ,C;P!WW3#!!HG.'''
 	exec(lzma.decompress(base64.a85decode(_SRC_B85)).decode("utf-8"), multiCMD.__dict__)
 
-version='0.28'
+version='0.30'
 __version__ = version
 
 # Colors
@@ -137,7 +138,7 @@ def find_btrfs_mounts(filters):
 
 def parse_show_info(info):
     fs_used = None
-    device_path = None
+    device_paths = []
     uuid = None
     for line in info:
         if "uuid:" in line:
@@ -145,7 +146,8 @@ def parse_show_info(info):
         if "Total devices" in line:
             fs_used = line.split("FS bytes used")[1].strip()
         if "path" in line:
-            device_path = line.split("path")[1].strip()
+            device_paths.append(line.split("path")[1].strip())
+    device_path = ", ".join(device_paths) if device_paths else None
     if fs_used is None or device_path is None or uuid is None:
         print(f"{RED}Could not parse btrfs show info.{RESET}")
         print(f"Output from btrfs filesystem show was:\n{info}")
@@ -154,7 +156,10 @@ def parse_show_info(info):
 def parse_device_stats(stats):
     err_dict = {}
     for line in stats:
-        key, val = line.split()
+        parts = line.split()
+        if len(parts) != 2:
+            continue
+        key, val = parts
         err_dict[key.split(".")[-1]] = val
     return err_dict
 
@@ -187,15 +192,15 @@ def parse_scrub_status(output):
     }
     for line in lines:
         if "Status:" in line:
-            scrub_data["scrub_status"] = line.split(":")[1].strip()
+            scrub_data["scrub_status"] = line.split(":", 1)[1].strip()
         elif "Scrub started:" in line:
-            scrub_data["scrub_time"] = line.split(":")[1].strip()
+            scrub_data["scrub_time"] = line.split(":", 1)[1].strip()
         elif "Rate:" in line:
-            scrub_data["scrub_rate"] = line.split(":")[1].strip()
+            scrub_data["scrub_rate"] = line.split(":", 1)[1].strip()
         elif "Total to scrub:" in line and scrub_data.get("scrub_status") != "running":
-            scrub_data["scrubbed_data"] = line.split(":")[1].strip()
+            scrub_data["scrubbed_data"] = line.split(":", 1)[1].strip()
         elif "Bytes scrubbed:" in line and scrub_data.get("scrub_status") == "running":
-            scrub_data["scrubbed_data"] = line.split(":")[1].strip()
+            scrub_data["scrubbed_data"] = line.split(":", 1)[1].strip()
         elif "Error summary:" in line:
             err_idx = lines.index(line)
             error_text = "\n".join(lines[err_idx:])
@@ -206,6 +211,46 @@ def parse_scrub_status(output):
 
     return scrub_data
 
+def parse_scrub_time_to_epoch(scrub_time):
+    # btrfs commonly prints values like: "Thu May  2 09:56:55 2024"
+    time_formats = [
+        "%a %b %d %H:%M:%S %Y",
+        "%a %b %d %H:%M:%S %Y %Z",
+        "%Y-%m-%d %H:%M:%S"
+    ]
+    for time_format in time_formats:
+        try:
+            return datetime.strptime(scrub_time, time_format).timestamp()
+        except ValueError:
+            continue
+    return None
+
+def filter_recently_scrubbed_mounts(btrfs_mounts, exclude_recent_days):
+    if exclude_recent_days <= 0:
+        return btrfs_mounts, []
+
+    now = time.time()
+    cutoff_seconds = exclude_recent_days * 24 * 3600
+    filtered_mounts = set()
+    skipped_mounts = []
+
+    for mount in btrfs_mounts:
+        scrub_output = execute_command(["btrfs", "scrub", "status", mount])
+        scrub_data = parse_scrub_status(scrub_output or [])
+        scrub_status = scrub_data.get("scrub_status", "").strip().lower()
+        scrub_time_epoch = parse_scrub_time_to_epoch(scrub_data["scrub_time"])
+
+        if scrub_status != "finished" or scrub_time_epoch is None:
+            filtered_mounts.add(mount)
+            continue
+
+        if now - scrub_time_epoch < cutoff_seconds:
+            skipped_mounts.append(mount)
+        else:
+            filtered_mounts.add(mount)
+
+    return filtered_mounts, skipped_mounts
+
 def issue_scrub_command(mounts):
     # print(f"{YELLOW}Issuing scrub on {mount}{RESET}")
     # execute_command(['bash','-c',f"btrfs scrub start {mount}"],wait=False)
@@ -225,8 +270,15 @@ def main():
     parser.add_argument("-s", "--scrub", help="Issue scrub to all pools", action="store_true")
     parser.add_argument("-i", "--interval", help="Interval for status check in seconds", default=2, type=int)
     parser.add_argument("-m", "--max_scrub_count", help="Maximum number of scrubs to issue at the same time", default=32, type=int)
+    parser.add_argument(
+        "-d",
+        "--exclude-recent-scrubbed-days",
+        help="Exclude mounts scrubbed within this many days",
+        default=0,
+        type=int
+    )
     parser.add_argument("--scrub_command_lockout", help="Lockout for scrub command. Used to block two commands sent quickly.", default=10, type=int)
-    parser.add_argument('pattern',nargs='*',help='Patterns to filter btrfs moutns. Default="*"')
+    parser.add_argument('pattern',nargs='*',help='Patterns to filter btrfs mounts. Default="*"')
     parser.add_argument('-V', '--version', action='version', version=f"%(prog)s {version} stat btrfs by pan@zopyr.us")
     try:
         import argcomplete
@@ -236,6 +288,19 @@ def main():
     args = parser.parse_args()
 
     btrfs_mounts = set(find_btrfs_mounts(args.pattern))
+    btrfs_mounts, skipped_mounts = filter_recently_scrubbed_mounts(
+        btrfs_mounts,
+        args.exclude_recent_scrubbed_days
+    )
+    if skipped_mounts:
+        print(
+            f"{YELLOW}Skipping mounts scrubbed within the last "
+            f"{args.exclude_recent_scrubbed_days}d: {', '.join(sorted(skipped_mounts))}{RESET}"
+        )
+
+    if not btrfs_mounts:
+        print(f"{RED}No Btrfs mounts found.{RESET}")
+        return
 
     # If the scrub flag is enabled, issue the scrub command to all mounts
     if args.scrub:
@@ -289,10 +354,10 @@ def main():
                 mount_dir_name,
                 device_path,
                 fs_used,
-                color_error_count(err_dict['write_io_errs']),
-                color_error_count(err_dict['read_io_errs']),
-                color_error_count(err_dict['corruption_errs']),
-                color_error_count(err_dict['generation_errs']),
+                color_error_count(err_dict.get('write_io_errs', 0)),
+                color_error_count(err_dict.get('read_io_errs', 0)),
+                color_error_count(err_dict.get('corruption_errs', 0)),
+                color_error_count(err_dict.get('generation_errs', 0)),
                 scrub_data["scrub_status"],
                 scrub_data["scrub_time"],
                 scrub_data["scrub_rate"],