Changeset 99086 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Mar 21, 2023 12:43:25 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156451

Message:

ValidationKit/{common/utils.py,testdriver/base.py}: Rework the
Solaris-specific core file configuration code to back up any existing
coreadm(8) changes before modifying the system-wide core file
configuration and then restore the original coreadm(8) setup afterwards.

File:

• trunk/src/VBox/ValidationKit/testdriver/base.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/base.py

@@ -717 +717 @@
         self.sKindCrashDump   = sKindCrashDump;
 
-        sCorePath = None;
         sOs       = utils.getHostOs();
         if sOs == 'solaris':
-            if sKindCrashDump is not None: # Enable.
-                sCorePath = getDirEnv('TESTBOX_PATH_SCRATCH', sAlternative = '/var/cores', fTryCreate = False);
-                (iExitCode, _, sErr) = utils.processOutputUnchecked([ 'coreadm', '-e', 'global', '-e', 'global-setid', \
-                                                                      '-e', 'process', '-e', 'proc-setid', \
-                                                                      '-g', os.path.join(sCorePath, '%f.%p.core')]);
-            else: # Disable.
-                (iExitCode, _, sErr) = utils.processOutputUnchecked([ 'coreadm', \
-                                                                      '-d', 'global', '-d', 'global-setid', \
-                                                                      '-d', 'process', '-d', 'proc-setid' ]);
-            if iExitCode != 0: # Don't report an actual error, just log this.
-                reporter.log('%s coreadm failed: %s' % ('Enabling' if sKindCrashDump else 'Disabling', sErr));
-
-        if sKindCrashDump is not None:
-            if sCorePath is not None:
-                reporter.log('Crash dumps enabled -- path is "%s"' % (sCorePath,));
-        else:
-            reporter.log('Crash dumps disabled');
+            # Both 'coreadm -e ...' and 'svccfg apply' only work if running with all privileges.
+            fIsRoot = os.getuid() == 0;
+            if fIsRoot is False:
+                return True;
+
+            sScratchPath = os.environ.get('TESTBOX_PATH_SCRATCH', '/var/tmp');
+            sCoreadmXmlFile = os.path.join(sScratchPath, 'coreadm.xml');
+            if sKindCrashDump is not None:
+                # If the current core file configuration has been modified from the system default
+                # then save the configuration to coreadm.xml so it can be restored afterwards.
+                (iExitCode, sStdOut, sStdErr) = utils.processOutputUnchecked([ 'svcprop', '-p', 'config_params', \
+                                                                               '-l', 'admin', 'svc:/system/coreadm:default' ]);
+                if iExitCode == 0 and sStdOut != '':
+                    (iExitCode, _, sStdErr) = utils.processOutputUnchecked([ 'svccfg', 'extract', '-l', 'admin', \
+                                                                             'svc:/system/coreadm:default', '>', \
+                                                                             sCoreadmXmlFile ]);
+                # Annoyingly svccfg(1M) returns zero for both success and failure but if the
+                # command fails errors are written to stderr.
+                if iExitCode != 0 or sStdErr != '':
+                    reporter.error('Failed to backup current system-wide core dump configuration: %s' % sStdErr);
+                    return False;
+
+                # Configure all core dumps, including those of setuid and setgid binaries, to be
+                # written to /var/cores using the naming pattern of core.argv0.process-ID, e.g.
+                # core.VBoxSVC.12345.
+                (iExitCode, _, sStdErr) = utils.processOutputUnchecked([ 'coreadm', '-e', 'global', '-e', 'global-setid', \
+                                                                         '-e', 'log', '-G', 'all', \
+                                                                         '-g', '/var/cores/core.%f.%p' ]);
+                if iExitCode != 0:
+                    reporter.error('Failed to update system-wide core dump configuration: %s' % sStdErr);
+                    return False;
+
+                reporter.log('Core file configuration successfully updated: All core files will be written to /var/cores.');
+            else:
+                # Restore the core file configuration to what it was before making the
+                # changes above.
+                (iExitCode, _, sStdErr) = utils.processOutputUnchecked([ 'svccfg', '-s', 'svc:/system/coreadm:default', \
+                                                                         'delcust' ]);
+                # Annoyingly svccfg(1M) returns zero for both success and failure but if the
+                # command fails errors are written to stderr.
+                if sStdErr == '' and os.path.exists(sCoreadmXmlFile):
+                    (iExitCode, _, sStdErr) = utils.processOutputUnchecked([ 'svccfg', 'apply', sCoreadmXmlFile ]);
+
+                if sStdErr != '':
+                    reporter.error('Failed to restore system-wide core dump configuration: %s' % sStdErr);
+                    return False;
+
+                reporter.log('Core file configuration successfully restored to previous state.');
 
         return True;