Tue, 23 Jan 2018 10:44:50 +0000
pyyaml was missing from listed dependencies
|
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
1 | # |
|
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
2 | # Borgend Backup instance |
|
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
3 | # |
|
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
4 | |
| 2 | 5 | import config |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
6 | import logging |
| 5 | 7 | import time |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
17
diff
changeset
|
8 | import keyring |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
9 | import borgend |
| 54 | 10 | import repository |
| 2 | 11 | from instance import BorgInstance |
| 49 | 12 | from threading import Thread, Lock, Condition |
| 13 | from scheduler import TerminableThread | |
| 2 | 14 | |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
15 | logger=borgend.logger.getChild(__name__) |
| 31 | 16 | |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
17 | # State |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
18 | INACTIVE=0 |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
19 | SCHEDULED=1 |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
20 | ACTIVE=2 |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
21 | BUSY=3 |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
22 | OFFLINE=4 |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
23 | ERRORS=5 |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
24 | |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
25 | def combine_state(state1, state2): |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
26 | return max(state1, state2) |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
27 | |
| 6 | 28 | loglevel_translation={ |
| 29 | 'CRITICAL': logging.CRITICAL, | |
| 30 | 'ERROR': logging.ERROR, | |
| 31 | 'WARNING': logging.WARNING, | |
| 32 | 'DEBUG': logging.DEBUG, | |
| 33 | 'INFO': logging.INFO | |
| 34 | } | |
| 35 | ||
| 36 | def translate_loglevel(x): | |
| 37 | if x in loglevel_translation: | |
| 38 | return loglevel_translation[x] | |
| 39 | else: | |
| 40 | return logging.ERROR | |
| 41 | ||
| 15 | 42 | def safe_get_int(t, x): |
| 43 | if x in t: | |
| 44 | tmp=t[x] | |
| 45 | if isinstance(tmp, int): | |
| 46 | return tmp | |
| 47 | return None | |
| 48 | ||
| 49 | ||
| 49 | 50 | class Backup(TerminableThread): |
|
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
51 | |
| 2 | 52 | def __decode_config(self, cfg): |
| 53 | loc0='backup target %d' % self.identifier | |
| 54 | ||
| 49 | 55 | self._name=config.check_string(cfg, 'name', 'Name', loc0) |
| 2 | 56 | |
| 49 | 57 | self.loc='backup target "%s"' % self._name |
| 2 | 58 | |
| 54 | 59 | reponame=config.check_string(cfg, 'repository', |
| 60 | 'Target repository', self.loc) | |
| 61 | ||
| 62 | self.repository=repository.get_controller(reponame) | |
| 2 | 63 | |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
64 | self.archive_prefix=config.check_string(cfg, 'archive_prefix', |
|
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
65 | 'Archive prefix', self.loc) |
|
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
66 | |
| 2 | 67 | self.archive_template=config.check_string(cfg, 'archive_template', |
| 68 | 'Archive template', self.loc) | |
| 69 | ||
| 70 | self.backup_interval=config.check_nonneg_int(cfg, 'backup_interval', | |
| 71 | 'Backup interval', self.loc, | |
| 72 | config.defaults['backup_interval']) | |
| 73 | ||
| 74 | self.retry_interval=config.check_nonneg_int(cfg, 'retry_interval', | |
| 75 | 'Retry interval', self.loc, | |
| 76 | config.defaults['retry_interval']) | |
| 77 | ||
| 78 | self.paths=config.check_nonempty_list_of_strings(cfg, 'paths', 'Paths', self.loc) | |
| 79 | ||
| 6 | 80 | self.common_parameters=config.check_list_of_dicts(cfg, 'common_parameters', |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
81 | 'Borg parameters', self.loc, |
|
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
82 | default=[]) |
|
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
83 | |
| 6 | 84 | self.create_parameters=config.check_list_of_dicts(cfg, 'create_parameters', |
| 85 | 'Create parameters', self.loc, | |
| 86 | default=[]) | |
| 87 | ||
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
88 | self.prune_parameters=config.check_list_of_dicts(cfg, 'prune_parameters', |
| 6 | 89 | 'Prune parameters', self.loc, |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
90 | default=[]) |
| 2 | 91 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
92 | self.__keychain_account=config.check_string(cfg, 'keychain_account', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
93 | 'Keychain account', self.loc, |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
94 | default='') |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
95 | |
| 32 | 96 | self.__passphrase=None |
| 97 | ||
|
30
3dd525652dc8
Added no_quit_menu_entry option
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
98 | if config.settings['extract_passphrases_at_startup']: |
| 32 | 99 | try: |
| 100 | self.extract_passphrase() | |
| 101 | except Exception: | |
| 102 | pass | |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
17
diff
changeset
|
103 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
104 | def extract_passphrase(self): |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
105 | acc=self.__keychain_account |
| 32 | 106 | if not self.__passphrase: |
| 107 | if acc and acc!='': | |
| 108 | logger.debug('Requesting passphrase') | |
| 109 | try: | |
| 110 | pw=keyring.get_password("borg-backup", acc) | |
| 111 | except Exception as err: | |
| 50 | 112 | logger.error('Failed to retrieve passphrase') |
| 32 | 113 | raise err |
| 114 | else: | |
| 115 | logger.debug('Received passphrase') | |
| 116 | self.__passphrase=pw | |
| 117 | else: | |
| 118 | self.__passphrase=None | |
| 119 | return self.__passphrase | |
| 2 | 120 | |
| 49 | 121 | def __init__(self, identifier, cfg, scheduler): |
| 2 | 122 | self.identifier=identifier |
|
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
123 | self.config=config |
| 32 | 124 | self.lastrun_when=None |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
125 | self.borg_instance=None |
| 5 | 126 | self.current_operation=None |
| 7 | 127 | self.thread_log=None |
| 8 | 128 | self.thread_res=None |
| 10 | 129 | self.scheduled_operation=None |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
130 | self.__status_update_callback=None |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
131 | self.state=INACTIVE |
| 49 | 132 | self.scheduler=scheduler |
| 133 | ||
| 134 | self.__decode_config(cfg) | |
| 135 | ||
| 136 | super().__init__(target = self.__main_thread, name = self._name) | |
| 137 | self.daemon=True | |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
138 | |
| 7 | 139 | def is_running(self): |
| 49 | 140 | with self._cond: |
| 8 | 141 | running=self.__is_running_unlocked() |
| 142 | return running | |
| 143 | ||
| 144 | def __is_running_unlocked(self): | |
| 145 | running=self.current_operation | |
| 146 | if not running: | |
| 147 | # Consistency check | |
| 148 | assert((not self.borg_instance and not self.thread_log and | |
| 149 | not self.thread_res)) | |
| 7 | 150 | return running |
| 151 | ||
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
152 | def __block_when_running(self): |
| 7 | 153 | running=self.is_running() |
| 154 | assert(not running) | |
| 2 | 155 | |
| 7 | 156 | def __log_listener(self): |
| 31 | 157 | logger.debug('Log listener thread waiting for entries') |
| 7 | 158 | success=True |
| 159 | for status in iter(self.borg_instance.read_log, None): | |
| 31 | 160 | logger.debug(str(status)) |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
161 | t=status['type'] |
| 15 | 162 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
163 | errors_this_message=None |
| 15 | 164 | callback=None |
| 165 | ||
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
166 | if t=='progress_percent': |
| 15 | 167 | current=safe_get_int(status, 'current') |
| 168 | total=safe_get_int(status, 'total') | |
| 169 | if current is not None and total is not None: | |
| 49 | 170 | with self._cond: |
| 17 | 171 | self.current_operation['progress_current']=current |
| 172 | self.current_operation['progress_total']=total | |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
12
diff
changeset
|
173 | status, callback=self.__status_unlocked() |
| 15 | 174 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
175 | elif t=='archive_progress': |
| 15 | 176 | original_size=safe_get_int(status, 'original_size') |
| 177 | compressed_size=safe_get_int(status, 'compressed_size') | |
| 178 | deduplicated_size=safe_get_int(status, 'deduplicated_size') | |
| 179 | if original_size is not None and original_size is not None and deduplicated_size is not None: | |
| 49 | 180 | with self._cond: |
| 17 | 181 | self.current_operation['original_size']=original_size |
| 182 | self.current_operation['compressed_size']=compressed_size | |
| 183 | self.current_operation['deduplicated_size']=deduplicated_size | |
| 15 | 184 | status, callback=self.__status_unlocked() |
| 185 | ||
| 186 | elif t=='progress_message': | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
187 | pass |
| 15 | 188 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
189 | elif t=='file_status': |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
190 | pass |
| 15 | 191 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
192 | elif t=='log_message': |
| 6 | 193 | if 'levelname' not in status: |
| 194 | status['levelname']='ERROR' | |
| 195 | if 'message' not in status: | |
| 196 | status['message']='UNKNOWN' | |
| 197 | if 'name' not in status: | |
| 198 | status['name']='borg' | |
| 15 | 199 | lvl=translate_loglevel(status['levelname']) |
| 31 | 200 | logger.log(lvl, status['name'] + ': ' + status['message']) |
| 15 | 201 | if lvl>=logging.WARNING: |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
202 | errors_this_message=status |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
203 | state=ERRORS |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
204 | if ('msgid' in status and |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
205 | (status['msgid']=='LockTimeout' or # observed in reality |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
206 | status['msgid']=='LockErrorT' or # in docs |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
207 | status['msgid']=='LockErrorT')): # in docs |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
208 | state=BUSY |
| 49 | 209 | with self._cond: |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
210 | self.state=combine_state(self.state, state) |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
211 | status, callback=self.__status_unlocked() |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
212 | else: |
| 31 | 213 | logger.debug('Unrecognised log entry %s' % str(status)) |
| 15 | 214 | |
| 215 | if callback: | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
216 | callback(self, status, errors=errors_this_message) |
| 6 | 217 | |
| 31 | 218 | logger.debug('Waiting for borg subprocess to terminate in log thread') |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
219 | |
| 6 | 220 | self.borg_instance.wait() |
| 221 | ||
| 31 | 222 | logger.debug('Borg subprocess terminated; terminating log listener thread') |
| 7 | 223 | |
| 224 | def __result_listener(self): | |
| 49 | 225 | with self._cond: |
| 10 | 226 | status, callback=self.__status_unlocked() |
| 227 | if callback: | |
| 228 | callback(self, status) | |
| 229 | ||
| 31 | 230 | logger.debug('Result listener thread waiting for result') |
| 7 | 231 | |
| 232 | res=self.borg_instance.read_result() | |
| 233 | ||
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
234 | # Finish processing remaining errors |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
235 | self.thread_log.join() |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
236 | |
| 49 | 237 | with self._cond: |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
238 | state=self.state |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
239 | |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
240 | # If there were no errors, reset back to INACTIVE state |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
241 | if state==ACTIVE: |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
242 | state=INACTIVE |
| 7 | 243 | |
| 31 | 244 | logger.debug('Borg result: %s' % str(res)) |
| 7 | 245 | |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
246 | if res is None and state==INACTIVE: |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
247 | logger.error('No result from borg despite no error in log') |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
248 | state=ERRORS |
| 7 | 249 | |
| 31 | 250 | logger.debug('Waiting for borg subprocess to terminate in result thread') |
| 7 | 251 | |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
252 | if not self.borg_instance.wait(): |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
253 | logger.critical('Borg subprocess did not terminate') |
|
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
254 | state=combine_state(state, ERRORS) |
| 7 | 255 | |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
256 | logger.debug('Borg subprocess terminated (end state %s); terminating result listener thread' % str(state)) |
| 12 | 257 | |
| 49 | 258 | with self._cond: |
| 10 | 259 | if self.current_operation['operation']=='create': |
| 32 | 260 | self.lastrun_when=self.current_operation['when_monotonic'] |
| 7 | 261 | self.thread_res=None |
| 12 | 262 | self.thread_log=None |
| 263 | self.borg_instance=None | |
| 264 | self.current_operation=None | |
| 48 | 265 | self.state=state |
| 49 | 266 | self._cond.notify() |
| 7 | 267 | |
| 49 | 268 | def __do_launch(self, op, archive_or_repository, *args): |
| 32 | 269 | passphrase=self.extract_passphrase() |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
270 | |
| 10 | 271 | inst=BorgInstance(op['operation'], archive_or_repository, *args) |
| 32 | 272 | inst.launch(passphrase=passphrase) |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
273 | |
| 31 | 274 | logger.debug('Creating listener threads') |
| 275 | ||
| 7 | 276 | t_log=Thread(target=self.__log_listener) |
| 277 | t_log.daemon=True | |
| 2 | 278 | |
| 7 | 279 | t_res=Thread(target=self.__result_listener) |
| 280 | t_res.daemon=True | |
| 281 | ||
| 282 | self.thread_log=t_log | |
| 283 | self.thread_res=t_res | |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
284 | self.borg_instance=inst |
| 10 | 285 | self.current_operation=op |
| 286 | self.current_operation['when_monotonic']=time.monotonic() | |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
287 | self.state=ACTIVE |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
288 | |
| 7 | 289 | t_log.start() |
| 290 | t_res.start() | |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
291 | |
| 49 | 292 | def __launch(self, op): |
| 8 | 293 | if self.__is_running_unlocked(): |
| 294 | logging.info('Cannot start %s: already running %s' | |
| 295 | % (operation, self.current_operation)) | |
| 296 | return False | |
| 297 | else: | |
| 32 | 298 | try: |
| 49 | 299 | logger.debug("Launching '%s' on '%s'" % (op['operation'], self._name)) |
| 8 | 300 | |
| 32 | 301 | if op['operation']=='create': |
| 54 | 302 | archive="%s::%s%s" % (self.repository.repository_name, |
| 32 | 303 | self.archive_prefix, |
| 304 | self.archive_template) | |
| 2 | 305 | |
| 49 | 306 | self.__do_launch(op, archive, |
| 32 | 307 | self.common_parameters+self.create_parameters, |
| 308 | self.paths) | |
| 309 | elif op['operation']=='prune': | |
| 54 | 310 | self.__do_launch(op, self.repository.repository_name, |
| 32 | 311 | ([{'prefix': self.archive_prefix}] + |
| 312 | self.common_parameters + | |
| 313 | self.prune_parameters)) | |
| 314 | else: | |
| 315 | raise NotImplementedError("Invalid operation '%s'" % op['operation']) | |
| 316 | except Exception as err: | |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
317 | logger.debug('Rescheduling after failure') |
| 32 | 318 | self.lastrun_when=time.monotonic() |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
319 | self.state=ERRORS |
| 32 | 320 | raise err |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
321 | |
| 8 | 322 | return True |
| 323 | ||
| 49 | 324 | def create(self): |
| 10 | 325 | op={'operation': 'create', 'detail': 'manual'} |
| 49 | 326 | with self._cond: |
| 327 | self.scheduled_operation=op | |
| 328 | self._cond.notify() | |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
329 | |
| 49 | 330 | def prune(self): |
| 10 | 331 | op={'operation': 'prune', 'detail': 'manual'} |
| 49 | 332 | with self._cond: |
| 333 | self.scheduled_operation=op | |
| 334 | self._cond.notify() | |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
335 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
336 | # TODO: Decide exact (manual) abort mechanism. Perhaps two stages |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
337 | def abort(self): |
| 49 | 338 | with self._cond: |
| 5 | 339 | if self.borg_instance: |
| 340 | self.borg_instance.terminate() | |
| 8 | 341 | |
| 342 | def __next_operation_unlocked(self): | |
| 343 | # TODO: pruning as well | |
| 5 | 344 | now=time.monotonic() |
| 32 | 345 | if not self.lastrun_when: |
| 10 | 346 | initial_interval=self.retry_interval |
| 347 | if initial_interval==0: | |
| 348 | initial_interval=self.backup_interval | |
| 349 | if initial_interval==0: | |
| 350 | return None | |
| 351 | else: | |
| 352 | return {'operation': 'create', | |
| 353 | 'detail': 'initial', | |
| 354 | 'when_monotonic': now+initial_interval} | |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
355 | elif self.state>=BUSY: |
| 10 | 356 | if self.retry_interval==0: |
| 357 | return None | |
| 358 | else: | |
| 359 | return {'operation': 'create', | |
| 360 | 'detail': 'retry', | |
| 32 | 361 | 'when_monotonic': self.lastrun_when+self.retry_interval} |
| 5 | 362 | else: |
| 363 | if self.backup_interval==0: | |
| 10 | 364 | return None |
| 5 | 365 | else: |
| 10 | 366 | return {'operation': 'create', |
| 38 | 367 | 'detail': 'normal', |
| 32 | 368 | 'when_monotonic': self.lastrun_when+self.backup_interval} |
| 10 | 369 | |
| 49 | 370 | def __main_thread(self): |
| 371 | with self._cond: | |
| 372 | while not self._terminate: | |
| 373 | op=None | |
| 374 | if not self.current_operation: | |
| 375 | op=self.__next_operation_unlocked() | |
| 376 | if not op: | |
| 377 | self.__update_status() | |
| 378 | self._cond.wait() | |
| 379 | else: | |
| 380 | now=time.monotonic() | |
| 381 | delay=max(0, op['when_monotonic']-now) | |
| 382 | logger.info("Scheduling '%s' (detail: %s) of '%s' in %d seconds" % | |
| 383 | (op['operation'], op['detail'], self._name, delay)) | |
| 384 | ||
| 385 | self.scheduled_operation=op | |
| 386 | self.state=combine_state(self.state, SCHEDULED) | |
| 387 | ||
| 388 | self.__update_status() | |
| 389 | self.scheduler.wait_until(now+delay, self._cond, self._name) | |
| 10 | 390 | |
| 49 | 391 | if self.scheduled_operation: |
| 392 | op=self.scheduled_operation | |
| 393 | self.scheduled_operation=None | |
| 54 | 394 | self.repository.queue_action(self._cond, name=self._name, |
| 395 | action=lambda: self.__launch(op)) | |
| 49 | 396 | # Kill a running borg to cause log and result threads to terminate |
| 397 | if self.borg_instance: | |
| 398 | logger.debug("Terminating a borg instance") | |
| 399 | self.borg_instance.terminate() | |
| 10 | 400 | |
| 49 | 401 | # Store threads to use outside lock |
| 402 | thread_log=self.thread_log | |
| 403 | thread_err=self.thread_err | |
| 404 | ||
| 405 | logger.debug("Waiting for log and result threads to terminate") | |
|
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
406 | |
| 49 | 407 | if thread_log: |
| 408 | thread_log.join() | |
|
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
409 | |
| 49 | 410 | if thread_res: |
| 411 | thread_res.join() | |
| 412 | ||
| 10 | 413 | |
| 414 | def __status_unlocked(self): | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
415 | callback=self.__status_update_callback |
| 38 | 416 | |
| 10 | 417 | if self.current_operation: |
| 418 | status=self.current_operation | |
| 419 | status['type']='current' | |
| 38 | 420 | # Errors should be set by listeners |
| 10 | 421 | else: |
| 38 | 422 | if self.scheduled_operation: |
| 423 | status=self.scheduled_operation | |
| 424 | status['type']='scheduled' | |
| 425 | else: | |
| 426 | status={'type': 'nothing'} | |
| 10 | 427 | |
| 49 | 428 | status['name']=self._name |
|
45
aa2a95dc6093
Further improvements to state reporting; indicate busyness if repository lock cannot be acquired
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
429 | status['state']=self.state |
| 38 | 430 | |
| 431 | if 'detail' not in status: | |
| 432 | status['detail']='NONE' | |
| 10 | 433 | |
| 434 | if 'when_monotonic' in status: | |
| 435 | status['when']=(status['when_monotonic'] | |
| 436 | -time.monotonic()+time.time()) | |
| 437 | ||
| 438 | return status, callback | |
| 439 | ||
| 49 | 440 | def __update_status(self): |
| 441 | status, callback = self.__status_unlocked() | |
| 442 | if callback: | |
| 443 | self._cond.release() | |
| 444 | try: | |
| 445 | callback(self, status) | |
| 446 | finally: | |
| 447 | self._cond.acquire() | |
| 448 | ||
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
449 | def set_status_update_callback(self, callback): |
| 49 | 450 | with self._cond: |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
451 | self.__status_update_callback=callback |
| 10 | 452 | |
| 49 | 453 | def status(self): |
| 454 | with self._cond: | |
| 455 | res=self.__status_unlocked() | |
| 456 | return res[0] | |
| 10 | 457 |