Version 1.9.24

Changelog

@@ -1,3 +1,7 @@
+Version 1.9.24
+---------
+ * Remove leftover pid files in /var/tmp during offline backup (#114)
+
 Version 1.9.23
 ---------
  * Code cleanups

libvirtnbdbackup/__init__.py

@@ -15,4 +15,4 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-__version__ = "1.9.23"
+__version__ = "1.9.24"

libvirtnbdbackup/common.py

@@ -177,6 +177,22 @@ def copy(args: Namespace, source: str, target: str) -> None:
         log.warning("Remote copy from [%s] to [%s] failed: [%s]", source, target, e)
 
 
+def remove(args: Namespace, file: str) -> None:
+    """Remove file either locally or remote"""
+    try:
+        if args.sshClient:
+            args.sshClient.run(f"rm -f {file}")
+        else:
+            os.remove(file)
+        log.debug("Removed: [%s]", file)
+    except FileNotFoundError:
+        pass
+    except OSError as e:
+        log.warning("Failed to remove [%s]: [%s]", file, e)
+    except sshError as e:
+        log.warning("Remote remove failed: [%s]: [%s]", file, e)
+
+
 def progressBar(total: int, desc: str, args: Namespace, count=0) -> tqdm:
     """Return tqdm object"""
     return tqdm(

libvirtnbdbackup/processinfo.py

@@ -25,3 +25,4 @@ class processInfo:
     logFile: str
     err: str
     out: str
+    pidFile: str

libvirtnbdbackup/qemu/command.py

@@ -87,7 +87,7 @@ def run(cmdLine: List[str], pidFile: str = "", toPipe: bool = False) -> processI
         else:
             realPid = p.pid
 
-        process = processInfo(realPid, logFileName, err, out)
+        process = processInfo(realPid, logFileName, err, out, pidFile)
         log.debug("Started [%s] process: [%s]", cmdLine[0], process)
 
     return process

libvirtnbdbackup/ssh/client.py

@@ -138,7 +138,7 @@ def run(self, cmd: str, pidFile: str = "", logFile: str = "") -> processInfo:
             pid = int(pidOut)
             log.debug("PID: [%s]", pid)
 
-        return processInfo(pid, logFile, err, out)
+        return processInfo(pid, logFile, err, out, pidFile)
 
     def disconnect(self):
         """Disconnect"""

man/virtnbdbackup.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH VIRTNBDBACKUP "1" "April 2023" "virtnbdbackup 1.9.23" "User Commands"
+.TH VIRTNBDBACKUP "1" "April 2023" "virtnbdbackup 1.9.24" "User Commands"
 .SH NAME
 virtnbdbackup \- backup utility for libvirt
 .SH DESCRIPTION
@@ -48,7 +48,7 @@ Backup only disk with target dev name (\fB\-i\fR vda)
 Exclude disk(s) with target dev name (\fB\-x\fR vda,vdb)
 .TP
 \fB\-f\fR SOCKETFILE, \fB\-\-socketfile\fR SOCKETFILE
-Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.35855\/\fP)
+Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.51823\/\fP)
 .TP
 \fB\-n\fR, \fB\-\-noprogress\fR
 Disable progress bar

man/virtnbdmap.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH VIRTNBDMAP "1" "April 2023" "virtnbdmap 1.9.23" "User Commands"
+.TH VIRTNBDMAP "1" "April 2023" "virtnbdmap 1.9.24" "User Commands"
 .SH NAME
 virtnbdmap \- map virtnbdbackup image files to nbd devices
 .SH DESCRIPTION

man/virtnbdrestore.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH VIRTNBDRESTORE "1" "April 2023" "virtnbdrestore 1.9.23" "User Commands"
+.TH VIRTNBDRESTORE "1" "April 2023" "virtnbdrestore 1.9.24" "User Commands"
 .SH NAME
 virtnbdrestore \- restore utility for libvirt
 .SH DESCRIPTION
@@ -40,7 +40,7 @@ Process only disk matching target dev name. (default: None)
 Disable progress bar
 .TP
 \fB\-f\fR SOCKETFILE, \fB\-\-socketfile\fR SOCKETFILE
-Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.35860\/\fP)
+Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.51828\/\fP)
 .TP
 \fB\-r\fR, \fB\-\-raw\fR
 Copy raw images as is during restore. (default: False)

virtnbdbackup

@@ -780,6 +780,9 @@ def backupDisk(
         logging.info("Stopping NBD Service.")
         lib.killProc(nbdProc.pid)
 
+    if args.offline is True:
+        lib.remove(args, nbdProc.pidFile)
+
     if args.stdout is False:
         if args.noprogress is True:
             logging.info(