Changeset 2436

Timestamp:

Aug 11, 2009, 10:38:42 PM (15 years ago)

Author:

broder

Message:

In invirt-remote:

• Instead of running all of the disk-wiping dds simultaneously, run them sequentially using a janitor daemon (LP: #411486).

Location:

trunk/packages/invirt-remote

Files:

• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/invirt-remote-host.dirs (added)
• debian/invirt-remote-host.init (modified) (1 diff)
• host/usr/sbin/invirt-janitor (added)
• host/usr/sbin/invirt-lvm (modified) (1 diff)

trunk/packages/invirt-remote/debian/changelog

@@ +1 @@
+invirt-remote (0.4.0) unstable; urgency=low
+
+  * Instead of running all of the disk-wiping dds simultaneously, run them
+    sequentially using a janitor daemon (LP: #411486).
+
+ -- Evan Broder <broder@mit.edu>  Tue, 11 Aug 2009 19:37:55 -0700
+
 invirt-remote (0.3.15) unstable; urgency=low
 

trunk/packages/invirt-remote/debian/control

@@ -22 +22 @@
 Package: invirt-remote-host
 Architecture: all
-Depends: ${misc:Depends}, remctl-server, invirt-console-host,
- invirt-vnc-server, python-cjson, python-yaml, util-linux
+Depends: ${misc:Depends}, daemon, remctl-server, invirt-console-host,
+ invirt-vnc-server, python-cjson, python-pyinotify, python-yaml,
+ util-linux
 Description: Installs the Invirt host remctl configuration
  This is the remctl configuration for an Invirt host. It allows any

trunk/packages/invirt-remote/debian/invirt-remote-host.init

@@ -21 +21 @@
 }
 
-case "$1" in
-  start|reload|force-reload|restart)
+reload_cfg()
+{
     log_begin_msg "Reloading config for $PACKAGE"
     gen_config
     log_end_msg $?
     invoke-rc.d openbsd-inetd start # returns 1 if inetd is running
-    [ $? -eq 1 ] && exit 0
+}
+
+case "$1" in
+  start)
+    reload_cfg
+
+    log_begin_msg "Starting the invirt-janitor for $PACKAGE"
+    daemon -n invirt-janitor -r invirt-janitor
+    log_end_msg $?
+    ;;
+  force-reload|restart)
+    reload_cfg
+
+    log_begin_msg "Restarting the invirt-janitor for $PACKAGE"
+    daemon -n invirt-janitor --restart
+    log_end_msg $?
     ;;
   stop)
+    log_begin_msg "Stopping the invirt-janitor for $PACKAGE"
+    daemon -n invirt-janitor --stop
+    log_end_msg $?
     ;;
   *)
-    log_success_msg "Usage: /etc/init.d/$PACKAGE {start|reload|force-reload|restart|stop}"
+    log_success_msg "Usage: /etc/init.d/$PACKAGE {start|force-reload|restart|stop}"
     ;;
 esac

trunk/packages/invirt-remote/host/usr/sbin/invirt-lvm

@@ -64 +64 @@
     ensureoff(machine)
     
-    # Fork. The child process wipes the LV and then deletes
-    # it. There's not really anything sane to do with errors (since
-    # this is running non-interactively), so let's just drop them on
-    # the floor for now.
-    if os.fork() == 0:
-        call(["/usr/bin/ionice", "-c", "2", "-n", "7", "/bin/dd", "if=/dev/zero", "of=%s" % new_lvpath])
-        call(["/sbin/lvchange", "-a", "n", new_lvpath])
-        call(["/sbin/lvchange", "-a", "ey", new_lvpath])
-        call(["/sbin/lvremove", "--force", new_lvpath])
+    # Touch a file corresponding to the new name of the LV; a separate
+    # daemon will handle wiping and deleting it.
+    open(os.path.join('/var/lib/invirt-remote/cleanup', new_lvname), 'w')
 elif subcommand == "lvresize":
     size = sys.argv[4]