2: ""
}
+
class InstanceDown(Exception):
"""The checked instance was not up"""
"""
if args:
msg = msg % args
- indent = kwargs.get('indent', 0)
- sys.stdout.write("%*s%s%s\n" % (2*indent, "",
+ indent = kwargs.get("indent", 0)
+ sys.stdout.write("%*s%s%s\n" % (2 * indent, "",
LOG_HEADERS.get(indent, " "), msg))
sys.stdout.flush()
class SimpleOpener(urllib.FancyURLopener):
"""A simple url opener"""
- # pylint: disable-msg=W0221
+ # pylint: disable=W0221
def prompt_user_passwd(self, host, realm, clear_cache=0):
"""No-interaction version of prompt_user_passwd."""
# we follow parent class' API
- # pylint: disable-msg=W0613
+ # pylint: disable=W0613
return None, None
def http_error_default(self, url, fp, errcode, errmsg, headers):
default=128, type="unit", metavar="<size>",
completion_suggest=("128M 256M 512M 1G 4G 8G"
" 12G 16G").split()),
+ cli.cli_option("--vcpu-count", dest="vcpu_count", help="VCPU count",
+ default=3, type="unit", metavar="<count>",
+ completion_suggest=("1 2 3 4").split()),
cli.DEBUG_OPT,
cli.VERBOSE_OPT,
cli.NOIPCHECK_OPT,
cli.cli_option("-t", "--disk-template", dest="disk_template",
choices=list(constants.DISK_TEMPLATES),
default=constants.DT_DRBD8,
- help="Disk template (diskless, file, plain or drbd) [drbd]"),
+ help="Disk template (diskless, file, plain, sharedfile"
+ " or drbd) [drbd]"),
cli.cli_option("-n", "--nodes", dest="nodes", default="",
help=("Comma separated list of nodes to perform"
" the burnin on (defaults to all nodes)"),
def wrapper(self, *args, **kwargs):
val = fn(self, *args, **kwargs)
for instance in self.instances:
- self._CheckInstanceAlive(instance) # pylint: disable-msg=W0212
+ self._CheckInstanceAlive(instance) # pylint: disable=W0212
return val
return wrapper
Log("Idempotent %s succeeded after %d retries",
msg, MAX_RETRIES - retry_count)
return val
- except Exception, err: # pylint: disable-msg=W0703
+ except Exception, err: # pylint: disable=W0703
if retry_count == 0:
Log("Non-idempotent %s failed, aborting", msg)
raise
cli.SetGenericOpcodeOpts(ops, self.opts)
self.queued_ops.append((ops, name, post_process))
else:
- val = self.ExecOp(self.queue_retry, *ops) # pylint: disable-msg=W0142
+ val = self.ExecOp(self.queue_retry, *ops) # pylint: disable=W0142
if post_process is not None:
post_process()
return val
self.ClearFeedbackBuf()
jex = cli.JobExecutor(cl=self.cl, feedback_fn=self.Feedback)
for ops, name, _ in jobs:
- jex.QueueJob(name, *ops) # pylint: disable-msg=W0142
+ jex.QueueJob(name, *ops) # pylint: disable=W0142
try:
results = jex.GetResults()
- except Exception, err: # pylint: disable-msg=W0703
+ except Exception, err: # pylint: disable=W0703
Log("Jobs failed: %s", err)
raise BurninFailure()
if post_process:
try:
post_process()
- except Exception, err: # pylint: disable-msg=W0703
+ except Exception, err: # pylint: disable=W0703
Log("Post process call for job %s failed: %s", name, err)
fail = True
val.append(result)
supported_disk_templates = (constants.DT_DISKLESS,
constants.DT_FILE,
+ constants.DT_SHARED_FILE,
constants.DT_PLAIN,
constants.DT_DRBD8)
if options.disk_template not in supported_disk_templates:
self.instances = args
self.bep = {
constants.BE_MEMORY: options.mem_size,
- constants.BE_VCPUS: 1,
+ constants.BE_VCPUS: options.vcpu_count,
}
self.hypervisor = None
if self.opts.iallocator:
pnode = snode = None
msg = "with iallocator %s" % self.opts.iallocator
- elif self.opts.disk_template not in constants.DTS_NET_MIRROR:
+ elif self.opts.disk_template not in constants.DTS_INT_MIRROR:
snode = None
msg = "on %s" % pnode
else:
Log(msg, indent=2)
op = opcodes.OpInstanceCreate(instance_name=instance,
- disks = [ {"size": size}
- for size in self.disk_size],
+ disks=[{"size": size}
+ for size in self.disk_size],
disk_template=self.opts.disk_template,
nics=self.opts.nics,
mode=constants.INSTANCE_CREATE,
import_log_msg = ("import from %s"
" with iallocator %s" %
(enode, self.opts.iallocator))
- elif self.opts.disk_template not in constants.DTS_NET_MIRROR:
+ elif self.opts.disk_template not in constants.DTS_INT_MIRROR:
snode = None
import_log_msg = ("import from %s to %s" %
(enode, pnode))
ignore_failures=True)
imp_dir = utils.PathJoin(constants.EXPORT_DIR, full_name)
imp_op = opcodes.OpInstanceCreate(instance_name=instance,
- disks = [ {"size": size}
- for size in self.disk_size],
+ disks=[{"size": size}
+ for size in self.disk_size],
disk_template=self.opts.disk_template,
nics=self.opts.nics,
mode=constants.INSTANCE_IMPORT,
if (len(self.nodes) == 1 and
opts.disk_template not in (constants.DT_DISKLESS, constants.DT_PLAIN,
- constants.DT_FILE)):
+ constants.DT_FILE,
+ constants.DT_SHARED_FILE)):
Err("When one node is available/selected the disk template must"
" be 'diskless', 'file' or 'plain'")
has_err = True
try:
self.BurnCreateInstances()
- if opts.do_replace1 and opts.disk_template in constants.DTS_NET_MIRROR:
+ if opts.do_replace1 and opts.disk_template in constants.DTS_INT_MIRROR:
self.BurnReplaceDisks1D8()
if (opts.do_replace2 and len(self.nodes) > 2 and
- opts.disk_template in constants.DTS_NET_MIRROR) :
+ opts.disk_template in constants.DTS_INT_MIRROR):
self.BurnReplaceDisks2()
if (opts.disk_template in constants.DTS_GROWABLE and
compat.any(n > 0 for n in self.disk_growth)):
self.BurnGrowDisks()
- if opts.do_failover and opts.disk_template in constants.DTS_NET_MIRROR:
+ if opts.do_failover and opts.disk_template in constants.DTS_MIRRORED:
self.BurnFailover()
if opts.do_migrate:
- if opts.disk_template != constants.DT_DRBD8:
- Log("Skipping migration (disk template not DRBD8)")
+ if opts.disk_template not in constants.DTS_MIRRORED:
+ Log("Skipping migration (disk template %s does not support it)",
+ opts.disk_template)
elif not self.hv_class.CAN_MIGRATE:
Log("Skipping migration (hypervisor %s does not support it)",
self.hypervisor)
if (opts.do_importexport and
opts.disk_template not in (constants.DT_DISKLESS,
+ constants.DT_SHARED_FILE,
constants.DT_FILE)):
self.BurnImportExport()
if not self.opts.keep_instances:
try:
self.BurnRemove()
- except Exception, err: # pylint: disable-msg=W0703
+ except Exception, err: # pylint: disable=W0703
if has_err: # already detected errors, so errors in removal
# are quite expected
Log("Note: error detected during instance remove: %s", err)
"""Main function.
"""
- utils.SetupLogging(constants.LOG_BURNIN, debug=False, stderr_logging=True)
+ utils.SetupLogging(constants.LOG_BURNIN, sys.argv[0],
+ debug=False, stderr_logging=True)
return Burner().BurninCluster()
projects / ganeti-local / blobdiff