Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: store date of last backup for each VM

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-03-10 04:29:14 +01:00
parent 6b59131dc9
commit 09652cb0f8
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core-modules/000QubesVm.py
View File

@ -126,6 +126,8 @@ class QubesVm(object):
"backup_content" : { 'default': False }, "backup_content" : { 'default': False },
"backup_size" : { 'default': 0, "eval": "int(value)" }, "backup_size" : { 'default': 0, "eval": "int(value)" },
"backup_path" : { 'default': "" }, "backup_path" : { 'default': "" },
"backup_timestamp": { 'eval': 'datetime.datetime.fromtimestamp('
'int(value)) if value else None' },
##### Internal attributes - will be overriden in __init__ regardless of args ##### Internal attributes - will be overriden in __init__ regardless of args
"config_file_template": { "eval": 'system_path["config_template_pv"]' }, "config_file_template": { "eval": 'system_path["config_template_pv"]' },
"icon_path": { "eval": 'os.path.join(self.dir_path, "icon.png") if self.dir_path is not None else None' }, "icon_path": { "eval": 'os.path.join(self.dir_path, "icon.png") if self.dir_path is not None else None' },
@ -155,6 +157,10 @@ class QubesVm(object):
attrs['mac']['save'] = 'str(self._mac)' attrs['mac']['save'] = 'str(self._mac)'
attrs['mac']['save_skip'] = 'self._mac is None' attrs['mac']['save_skip'] = 'self._mac is None'
attrs['backup_timestamp']['save'] = 'self.backup_timestamp.strftime("%s")'
attrs['backup_timestamp']['save_skip'] = 'self.backup_timestamp is ' \
'None'
attrs['netvm']['save'] = 'str(self.netvm.qid) if self.netvm is not None else "none"' attrs['netvm']['save'] = 'str(self.netvm.qid) if self.netvm is not None else "none"'
attrs['netvm']['save_attr'] = "netvm_qid" attrs['netvm']['save_attr'] = "netvm_qid"
attrs['template']['save'] = 'str(self.template.qid) if self.template else "none"' attrs['template']['save'] = 'str(self.template.qid) if self.template else "none"'

12
core/backup.py
View File

@ -35,6 +35,7 @@ import tempfile
import time import time
import grp,pwd import grp,pwd
import errno import errno
import datetime
from multiprocessing import Queue,Process from multiprocessing import Queue,Process
BACKUP_DEBUG = False BACKUP_DEBUG = False
@ -660,6 +661,17 @@ def backup_do(base_backup_dir, files_to_backup, passphrase,
print "Sparse1 proc return code:", tar_sparse.poll() print "Sparse1 proc return code:", tar_sparse.poll()
vmproc.stdin.close() vmproc.stdin.close()
# Save date of last backup
qvm_collection = QubesVmCollection()
qvm_collection.lock_db_for_writing()
qvm_collection.load()
for vm in qvm_collection.values():
if vm.backup_content:
vm.backup_timestamp = datetime.datetime.now()
qvm_collection.save()
qvm_collection.unlock_db()
''' '''
' Wait for backup chunk to finish ' Wait for backup chunk to finish