Convert to run_in_thread module call.

truenas · Feb 13, 2025 · 21c6866 · 21c6866
1 parent 462dd1d
commit 21c6866
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/middlewared/middlewared/plugins/audit/audit.py b/src/middlewared/middlewared/plugins/audit/audit.py
@@ -601,7 +601,7 @@ async def setup(self):
         # Generate the initial truenas_verify file
         try:
             current_version = await self.middleware.call('system.version')
-            rc, err = await setup_truenas_verify(current_version)
+            rc, err = await setup_truenas_verify(self.middleware, current_version)
             if rc:
                 self.logger.error(
                     'Unexpected result from truenas_verify initial setup. '

diff --git a/src/middlewared/middlewared/plugins/audit/utils.py b/src/middlewared/middlewared/plugins/audit/utils.py
@@ -5,7 +5,7 @@
 from .schema.common import AuditEventParam
 
 import middlewared.sqlalchemy as sa
-from middlewared.utils import run
+from truenas_verify import mtree_verify
 
 AUDIT_DATASET_PATH = '/audit'
 AUDITED_SERVICES = [('MIDDLEWARE', 0.1), ('SMB', 0.1), ('SUDO', 0.1), ('SYSTEM', 0.1)]
@@ -199,12 +199,12 @@ def requires_python_filtering(
 AUDIT_TABLES = {svc[0]: generate_audit_table(*svc) for svc in AUDITED_SERVICES}
 
 
-async def setup_truenas_verify(sysver: str) -> tuple:
+async def setup_truenas_verify(middleware, sysver: str) -> tuple:
     """
     Called by audit setup to generate the initial truenas_verify
     file for an updated or initial TrueNAS version.
     """
-    verify_res = await run(['truenas_verify', 'init', sysver], check=False)
+    verify_res = await middleware.run_in_thread(mtree_verify.do_verify, ['init', sysver])
 
     err = ""
     if verify_res.stderr: