Add “canceled” status for opcodes

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index d3a8c10..8a56e07 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -28,6 +28,7 @@ PROTOCOL_VERSION = 13
 RELEASE_VERSION = _autoconf.PACKAGE_VERSION
 OS_API_VERSION = 5
 EXPORT_VERSION = 0
+RAPI_VERSION = 2
 
 
 # Format for CONFIG_VERSION:
@@ -81,7 +82,7 @@ CONFIG_VERSION = BuildVersion(CONFIG_MAJOR, CONFIG_MINOR, CONFIG_REVISION)
 DATA_DIR = _autoconf.LOCALSTATEDIR + "/lib/ganeti"
 RUN_DIR = _autoconf.LOCALSTATEDIR + "/run"
 RUN_GANETI_DIR = RUN_DIR + "/ganeti"
-BDEV_CACHE_DIR = RUN_GANETI_DIR # TODO(2.0): move deeper
+BDEV_CACHE_DIR = RUN_GANETI_DIR + "/bdev-cache"
 DISK_LINKS_DIR = RUN_GANETI_DIR + "/instance-disks"
 # keep RUN_GANETI_DIR first here, to make sure all get created when the node
 # daemon is started (this takes care of RUN_DIR being tmpfs)
@@ -107,6 +108,8 @@ 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"
 
 OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH
 EXPORT_DIR = _autoconf.EXPORT_DIR
@@ -250,6 +253,9 @@ JOB_QUEUE_VERSION = 1
 JOB_QUEUE_LOCK_FILE = QUEUE_DIR + "/lock"
 JOB_QUEUE_VERSION_FILE = QUEUE_DIR + "/version"
 JOB_QUEUE_SERIAL_FILE = QUEUE_DIR + "/serial"
+JOB_QUEUE_ARCHIVE_DIR = QUEUE_DIR + "/archive"
+
+JOB_ID_TEMPLATE = r"\d+"
 
 # Job status
 JOB_STATUS_QUEUED = "queued"
@@ -260,5 +266,14 @@ JOB_STATUS_ERROR = "error"
 
 OP_STATUS_QUEUED = "queued"
 OP_STATUS_RUNNING = "running"
+OP_STATUS_CANCELED = "canceled"
 OP_STATUS_SUCCESS = "success"
 OP_STATUS_ERROR = "error"
+
+# Execution log types
+ELOG_MESSAGE = "message"
+ELOG_PROGRESS = "progress"
+
+# Temporary RAPI constants until we have cluster parameters
+RAPI_ENABLE = True
+RAPI_PORT = 5080