Commit 1d645825 authored by Iustin Pop's avatar Iustin Pop
Browse files

Fix two logging messages in TLReplaceDisks

Commit f0f8d060

 (“Show old primary/secondary node on disk
replacement”) added two wrong uses of feedback_fn, which results in
log entries such like these:

      "log": [
        [
          7, [1351258326, 466214], "message", "Replacing disk(s) 0 for instance 'instance1.example.com'"
        ],
        [
          8, [1351258326, 749391], "Current primary node: %s", "node1"
        ],
        [
          9, [1351258326, 774829], "Current seconary node: %s", "node4"
        ],
        [
          10, [1351258329, 620410], "message", "STEP 1/6 Check device existence"
        ],

(the first and fourth are OK, the 2nd and 3rd are broken).

The API of jqueue._OpExecCallbacks.Feedback should probably be changed
to prevent such an occurrence in the future.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichele Tartara <mtartara@google.com>
parent fef919b7
......@@ -11427,8 +11427,8 @@ class TLReplaceDisks(Tasklet):
 
feedback_fn("Replacing disk(s) %s for instance '%s'" %
(utils.CommaJoin(self.disks), self.instance.name))
feedback_fn("Current primary node: %s", self.instance.primary_node)
feedback_fn("Current seconary node: %s",
feedback_fn("Current primary node: %s" % self.instance.primary_node)
feedback_fn("Current seconary node: %s" %
utils.CommaJoin(self.instance.secondary_nodes))
 
activate_disks = (self.instance.admin_state != constants.ADMINST_UP)
......
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