Make WaitForJobChanges deal with long jobs

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 1950ac5..08e5ba0 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -95,7 +95,19 @@ SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
 QUEUE_DIR = DATA_DIR + "/queue"
 ETC_HOSTS = "/etc/hosts"
 DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
-MASTER_SOCKET = RUN_GANETI_DIR + "/master.sock"
+
+# Quoting unix(7) on Linux:
+#   Linux also supports an abstract namespace which is independent of the file
+#   system. [...] If sun_path starts with a null byte ('\0'), then it refers to
+#   the abstract namespace maintained by the Unix protocol module. The socket's
+#   address in this namespace is given by the rest of the bytes in sun_path.
+#
+# By using this Linux-specific way we don't have to care about removing the
+# socket file when quitting or starting (after an unclean shutdown).
+#
+# Sample output for "netstat -nlp":
+#   unix 2 [ ACC ] STREAM LISTENING 247919 1234/python @ganeti-master
+MASTER_SOCKET = "\0ganeti-master"
 
 # PID files
 MASTERD_PID = "ganeti-masterd"
@@ -108,13 +120,15 @@ FIRST_DRBD_PORT = 11000
 LAST_DRBD_PORT = 14999
 MASTER_SCRIPT = "ganeti-master"
 
-LOG_DIR = _autoconf.LOCALSTATEDIR + "/log/ganeti"
-LOG_OS_DIR = LOG_DIR + "/os"
-LOG_NODESERVER = LOG_DIR + "/node-daemon.log"
-LOG_WATCHER = LOG_DIR + "/watcher.log"
-LOG_MASTERDAEMON = LOG_DIR + "/master-daemon.log"
-LOG_RAPISERVER = LOG_DIR + "/rapi-daemon.log"
-LOG_RAPIACCESS = LOG_DIR + "/rapi-access.log"
+LOG_DIR = _autoconf.LOCALSTATEDIR + "/log/ganeti/"
+LOG_OS_DIR = LOG_DIR + "os"
+LOG_NODESERVER = LOG_DIR + "node-daemon.log"
+LOG_WATCHER = LOG_DIR + "watcher.log"
+LOG_MASTERDAEMON = LOG_DIR + "master-daemon.log"
+LOG_RAPISERVER = LOG_DIR + "rapi-daemon.log"
+LOG_RAPIACCESS = LOG_DIR + "rapi-access.log"
+LOG_COMMANDS = LOG_DIR + "commands.log"
+LOG_BURNIN = LOG_DIR + "burnin.log"
 
 OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH
 EXPORT_DIR = _autoconf.EXPORT_DIR
@@ -124,6 +138,8 @@ EXPORT_CONF_FILE = "config.ini"
 XEN_KERNEL = _autoconf.XEN_KERNEL
 XEN_INITRD = _autoconf.XEN_INITRD
 
+KVM_PATH = _autoconf.KVM_PATH
+
 VALUE_DEFAULT = "default"
 VALUE_NONE = "none"
 
@@ -231,7 +247,8 @@ INSTANCE_REBOOT_FULL = "full"
 HT_XEN_PVM30 = "xen-3.0"
 HT_FAKE = "fake"
 HT_XEN_HVM31 = "xen-hvm-3.1"
-HYPER_TYPES = frozenset([HT_XEN_PVM30, HT_FAKE, HT_XEN_HVM31])
+HT_KVM = "kvm"
+HYPER_TYPES = frozenset([HT_XEN_PVM30, HT_FAKE, HT_XEN_HVM31, HT_KVM])
 HTS_REQ_PORT = frozenset([HT_XEN_HVM31])
 
 HT_HVM_VNC_BASE_PORT = 5900
@@ -262,6 +279,9 @@ JOB_QUEUE_ARCHIVE_DIR = QUEUE_DIR + "/archive"
 
 JOB_ID_TEMPLATE = r"\d+"
 
+# unchanged job return
+JOB_NOTCHANGED = "nochange"
+
 # Job status
 JOB_STATUS_QUEUED = "queued"
 JOB_STATUS_RUNNING = "running"