Changeset 2097
- Timestamp:
- Feb 5, 2009, 3:24:56 AM (16 years ago)
- Location:
- trunk/packages
- Files:
-
- 8 edited
-
invirt-base/debian/changelog (modified) (1 diff)
-
invirt-base/python/invirt/common.py (modified) (1 diff)
-
invirt-base/python/invirt/remctl.py (modified) (1 diff)
-
invirt-remote/debian/changelog (modified) (1 diff)
-
invirt-remote/host/usr/sbin/invirt-remote (modified) (2 diffs)
-
invirt-remote/host/usr/sbin/invirt-vmcontrol (modified) (1 diff)
-
invirt-remote/server/usr/sbin/invirt-remote-proxy (modified) (1 diff)
-
invirt-web/code/controls.py (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/invirt-base/debian/changelog
r2095 r2097 1 invirt-base (0.0.21) unstable; urgency=low2 3 * Get rid of confusing err=True option to invirt.remctl.remctl4 5 -- Evan Broder <broder@mit.edu> Fri, 30 Jan 2009 19:49:46 -05006 7 1 invirt-base (0.0.20) unstable; urgency=low 8 2 -
trunk/packages/invirt-base/python/invirt/common.py
r2095 r2097 76 76 class CodeError(Exception): 77 77 """Exception for internal errors or bad faith input.""" 78 def __init__(self, message, code=None): 79 Exception.__init__(self, message) 80 self.code = code 78 pass 81 79 82 80 # -
trunk/packages/invirt-base/python/invirt/remctl.py
r2095 r2097 37 37 stderr=subprocess.PIPE) 38 38 v = p.wait() 39 if kws.get('err'): 40 return p.stdout.read(), p.stderr.read() 39 41 if v: 40 raise CodeError('ERROR on remctl %s:\n%s' % (args, p.stderr.read()), v) 42 print >> sys.stderr, 'Error', v, 'on remctl', args, ':' 43 print >> sys.stderr, p.stderr.read() 44 raise CodeError('ERROR on remctl') 41 45 return p.stdout.read() -
trunk/packages/invirt-remote/debian/changelog
r2094 r2097 1 invirt-remote (0.3.2) unstable; urgency=low2 3 * Don't pass untrusted arguments to xm info.4 * Exit with a non-0 error code on the host if there's an error.5 * Always exec instead of fork&exec on the remctl server so that return6 codes get passed on.7 8 -- Evan Broder <broder@mit.edu> Sat, 31 Jan 2009 03:51:54 -05009 10 1 invirt-remote (0.3.1) unstable; urgency=low 11 2 -
trunk/packages/invirt-remote/host/usr/sbin/invirt-remote
r2093 r2097 22 22 ;; 23 23 info) 24 exec /usr/sbin/xm info24 COMMAND=/usr/sbin/xm 25 25 ;; 26 26 vnccert) … … 39 39 esac 40 40 41 exec "$COMMAND""$SERVICE" "$@"41 $COMMAND "$SERVICE" "$@" -
trunk/packages/invirt-remote/host/usr/sbin/invirt-vmcontrol
r2093 r2097 12 12 ACTION="$2" 13 13 MACHINE="d_$ORIGMACHINE" 14 15 xm () {16 command xm "$@" || exit 3517 }18 14 19 15 case "$ACTION" in -
trunk/packages/invirt-remote/server/usr/sbin/invirt-remote-proxy
r2094 r2097 14 14 case "$TYPE/$SERVICE" in 15 15 web/listvms ) 16 execinvirt-remote-listvms "$@" ;;16 invirt-remote-listvms "$@" ;; 17 17 web/vnccert ) 18 execinvirt-remote-vnccert "$@" ;;18 invirt-remote-vnccert "$@" ;; 19 19 control/help ) 20 execinvirt-remctl-help ;;20 invirt-remctl-help ;; 21 21 control/create|control/install ) 22 execinvirt-remote-create "$SERVICE" "$MACHINE" "$@" ;;22 invirt-remote-create "$SERVICE" "$MACHINE" "$@" ;; 23 23 control/listhost|control/list-host ) 24 execinvirt-remote-listhost "$MACHINE" "$@" ;;24 invirt-remote-listhost "$MACHINE" "$@" ;; 25 25 control/* ) 26 26 # Everything but create must go where the VM is already running. 27 execinvirt-remote-control "$MACHINE" "$SERVICE" "$@" ;;27 invirt-remote-control "$MACHINE" "$SERVICE" "$@" ;; 28 28 * ) 29 execremctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;29 remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;; 30 30 esac -
trunk/packages/invirt-web/code/controls.py
r2095 r2097 65 65 id of the CD (e.g. 'gutsy_i386') 66 66 """ 67 try: 68 if cdtype is not None: 69 out = remctl('control', machine.name, 'create', 70 cdtype) 71 else: 72 out = remctl('control', machine.name, 'create') 73 except CodeError, e: 74 if 'already running' in e.message: 75 raise InvalidInput('action', 'create', 76 'VM %s is already on' % machine.name) 77 else: 67 if cdtype is not None: 68 out, err = remctl('control', machine.name, 'create', 69 cdtype, err=True) 70 else: 71 out, err = remctl('control', machine.name, 'create', 72 err=True) 73 if 'already running' in err: 74 raise InvalidInput('action', 'create', 75 'VM %s is already on' % machine.name) 76 elif err: 78 77 raise CodeError('"%s" on "control %s create %s' 79 78 % (err, machine.name, cdtype)) … … 158 157 Gets and parses xm list --long 159 158 """ 160 try: 161 value_string = remctl('control', machine.name, 'list-long') 162 except CodeError, e: 163 if 'is not on' in e.message: 164 return None 165 else: 166 raise 159 value_string, err_string = remctl('control', machine.name, 'list-long', 160 err=True) 161 if 'Unknown command' in err_string: 162 raise CodeError("ERROR in remctl list-long %s is not registered" % 163 (machine.name,)) 164 elif 'is not on' in err_string: 165 return None 166 elif err_string: 167 raise CodeError("ERROR in remctl list-long %s: %s" % 168 (machine.name, err_string)) 167 169 status = parseStatus(value_string) 168 170 return status … … 170 172 def listHost(machine): 171 173 """Return the host a machine is running on""" 172 try: 173 out = remctl('control', machine.name, 'listhost') 174 except CodeError, e: 174 out, err = remctl('control', machine.name, 'listhost', err=True) 175 if err: 175 176 return None 176 177 return out.strip() … … 178 179 def vnctoken(machine): 179 180 """Return a time-stamped VNC token""" 180 try: 181 out = remctl('control', machine.name, 'vnctoken') 182 except CodeError, e: 181 out, err = remctl('control', machine.name, 'vnctoken', err=True) 182 if err: 183 183 return None 184 184 return out.strip() … … 186 186 def deleteVM(machine): 187 187 """Delete a VM.""" 188 try: 189 remctl('control', machine.name, 'destroy') 190 except CodeError: 191 pass 188 remctl('control', machine.name, 'destroy', err=True) 192 189 session.begin() 193 190 delete_disk_pairs = [(machine.name, d.guest_device_name) … … 219 216 raise CodeError("Invalid action '%s'" % action) 220 217 if action == 'Reboot': 221 try: 222 if cdrom is not None: 223 out = remctl('control', machine.name, 'reboot', cdrom) 224 else: 225 out = remctl('control', machine.name, 'reboot') 226 except CodeError, e: 227 if re.match("machine '.*' is not on", e.message): 218 if cdrom is not None: 219 out, err = remctl('control', machine.name, 'reboot', cdrom, 220 err=True) 221 else: 222 out, err = remctl('control', machine.name, 'reboot', 223 err=True) 224 if err: 225 if re.match("machine '.*' is not on", err): 228 226 raise InvalidInput("action", "reboot", 229 227 "Machine is not on") 230 228 else: 231 raise 229 print >> sys.stderr, 'Error on reboot:' 230 print >> sys.stderr, err 231 raise CodeError('ERROR on remctl') 232 232 233 233 elif action == 'Power on': … … 238 238 bootMachine(machine, cdrom) 239 239 elif action == 'Power off': 240 try: 241 out = remctl('control', machine.name, 'destroy') 242 except CodeError, e: 243 if re.match("machine '.*' is not on", e.message): 240 out, err = remctl('control', machine.name, 'destroy', err=True) 241 if err: 242 if re.match("machine '.*' is not on", err): 244 243 raise InvalidInput("action", "Power off", 245 244 "Machine is not on.") 246 245 else: 247 raise 246 print >> sys.stderr, 'Error on power off:' 247 print >> sys.stderr, err 248 raise CodeError('ERROR on remctl') 248 249 elif action == 'Shutdown': 249 try: 250 out = remctl('control', machine.name, 'shutdown') 251 except CodeError, e: 252 if re.match("machine '.*' is not on", e.message): 250 out, err = remctl('control', machine.name, 'shutdown', err=True) 251 if err: 252 if re.match("machine '.*' is not on", err): 253 253 raise InvalidInput("action", "Shutdown", 254 254 "Machine is not on.") 255 255 else: 256 raise 256 print >> sys.stderr, 'Error on Shutdown:' 257 print >> sys.stderr, err 258 raise CodeError('ERROR on remctl') 257 259 elif action == 'Delete VM': 258 260 deleteVM(machine)
Note: See TracChangeset
for help on using the changeset viewer.
