Revision 9d7b1e53

b/lib/constants.py
137 137
CONFD_HMAC_KEY = DATA_DIR + "/hmac.key"
138 138
CLUSTER_DOMAIN_SECRET_FILE = DATA_DIR + "/cluster-domain-secret"
139 139
WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
140
WATCHER_PAUSEFILE = DATA_DIR + "/watcher.pause"
141 140
INSTANCE_STATUS_FILE = RUN_GANETI_DIR + "/instance-status"
142 141
SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
143 142
RAPI_USERS_FILE = DATA_DIR + "/rapi/users"
......
156 155
TOOLSDIR = _autoconf.TOOLSDIR
157 156
CONF_DIR = SYSCONFDIR + "/ganeti"
158 157

  
158
#: Lock file for watcher, locked in shared mode by watcher; lock in exclusive
159
# mode to block watcher (see L{cli._RunWhileClusterStoppedHelper.Call}
160
WATCHER_LOCK_FILE = LOCK_DIR + "/ganeti-watcher.lock"
161

  
162
#: Status file for per-group watcher, locked in exclusive mode by watcher
163
WATCHER_GROUP_STATE_FILE = DATA_DIR + "/watcher.%s.data"
164

  
165
#: File containing Unix timestamp until which watcher should be paused
166
WATCHER_PAUSEFILE = DATA_DIR + "/watcher.pause"
167

  
159 168
ALL_CERT_FILES = frozenset([NODED_CERT_FILE, RAPI_CERT_FILE])
160 169

  
161 170
MASTER_SOCKET = SOCKET_DIR + "/ganeti-master"
b/qa/qa_daemon.py
66 66

  
67 67
  """
68 68
  AssertCommand(["rm", "-f", constants.WATCHER_STATEFILE])
69
  AssertCommand([
70
    "bash", "-c",
71
    "rm -vf %s" % (constants.WATCHER_GROUP_STATE_FILE % "*-*-*-*")
72
    ])
69 73

  
70 74

  
71 75
def _RunWatcherDaemon():

Also available in: Unified diff