Commit d65da96a authored by Niklas Hambuechen's avatar Niklas Hambuechen

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12
  Fix hlint warnings found by hlint 1.9.11
  Make watcher identify itself on disk activation
Signed-off-by: default avatarNiklas Hambuechen <niklash@google.com>
Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
parents 1ae0c2fa fa37a4f4
......@@ -381,7 +381,11 @@ def _VerifyDisks(cl, uuid, nodes, instances):
" or has offline secondaries", name)
continue
job.append(opcodes.OpInstanceActivateDisks(instance_name=name))
op = opcodes.OpInstanceActivateDisks(instance_name=name)
op.reason = [(constants.OPCODE_REASON_SRC_WATCHER,
"Activating disks for instance %s" % name,
utils.EpochNano())]
job.append(op)
if job:
job_id = cli.SendJob(job, cl=cl)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment