Fixes #13667: Add condition_once and execute_once generic methods #849

amousset · 2018-10-17T10:32:26Z

https://www.rudder-project.org/redmine/issues/13667

amousset · 2018-10-17T10:33:06Z

Do not merge for now, wip

amousset · 2018-10-17T10:37:05Z

Commit modified

amousset · 2018-10-17T10:43:53Z

Commit modified

amousset · 2018-10-17T10:54:21Z

Commit modified

amousset · 2018-10-17T15:00:14Z

Commit modified

amousset · 2018-10-17T15:42:29Z

Commit modified

ncharles · 2018-10-17T15:59:17Z

tree/30_generic_methods/command_execution_once.cf

+
+  commands:
+    reserved::
+      "${command}"


why not using command_execution ?

Makes sense indeed (with command_execution_result)

amousset · 2018-10-18T10:27:50Z

Commit modified

amousset · 2018-10-18T11:13:16Z

Commit modified

amousset · 2018-10-18T11:19:51Z

Commit modified

amousset · 2018-10-18T11:35:51Z

Commit modified

amousset · 2018-10-18T12:06:34Z

Commit modified

amousset · 2018-10-18T12:32:13Z

Commit modified

ncharles · 2018-10-18T12:38:42Z

tests/acceptance/30_generic_methods/command_execution_once.cf

+    "phDDD"  usebundle => command_execution_once("exit 4",  "${ok_codes}", "ok", "testD");
+
+    "enable"  usebundle => set_dry_run_mode("true");
+    "phE"     usebundle => command_execution_once("exit 5",  "${ok_codes}", "ok", "testE");


auditing execute_once is an error ? this is surprising, but i don't know what it should be

This is the current behavior with other command methods, I think it's the best we can do.

I'm adding a test for already executed command in audit mode

amousset · 2018-10-18T12:53:07Z

Commit modified

amousset · 2018-10-18T14:35:24Z

Commit modified

amousset · 2018-10-18T15:03:55Z

Commit modified

ncharles · 2018-10-18T12:56:14Z

tree/30_generic_methods/condition_once.cf

+      "failure" usebundle => _classes_failure("${old_class_prefix}");
+      "failure" usebundle => _classes_failure("${class_prefix}");
+
+    pass3.already_set::


already_set is set if the flag was already reserved - so if something else reserved it previously, but didn't set it, it will be reported as success. Is it expected ?

amousset · 2018-10-18T16:07:06Z

Commit modified

ncharles · 2018-10-18T19:21:10Z

tree/30_generic_methods/permissions_recurse.cf

@@ -54,7 +54,7 @@ bundle agent permissions_recurse(path, mode, owner, group)
      "reenable_reporting_${class_prefix}"
                                   usebundle => enable_reporting,
                                  ifvarclass => "should_report";
-      "new result classes"         usebundle => _classes_copy("${inner_class}", "${class_prefix}");
+      "new result classes"         usebundle => _classes_copy("${inner_class_prefix}", "${class_prefix}");


this should not be part of this PR

definitely, I'll open a ticket (I just saw this while copy/pasting the inner class code)

ncharles · 2018-10-18T19:25:06Z

tree/20_cfe_basics/flag_lib.cf

@@ -49,6 +49,8 @@
 #   * `ok`: if the flag was correctly reserved
 #   * `failed`: if the flag could not be reserved. I can happen if it was reserved by another agent.
 #
+# * `cancel_flag` to remove a flag reservation. This does not affect already set classes.


the code DO cancel the persistent classes.

YES, good spot, s/classes/flags

ncharles · 2018-10-18T19:30:39Z

tree/20_cfe_basics/flag_lib.cf

@@ -169,16 +198,17 @@ bundle agent set_flag(name) {
      "notreserved"
        bundle_return_value_index => "1",
                          comment => "${flag_unique.value}",
-                               if => "!flag_reserved_${cname}";
+                               if => "!reserved";


notreserved is never used - is it for future usage ?

It is actually used for more precise testing (and maybe for future usage too).

Great ! Thank you

ncharles · 2018-10-18T19:32:03Z

tree/30_generic_methods/command_execution_once.cf

+# @parameter until          Try to execute the command until a particular state: 'ok', 'any' (defaults to 'any')
+# @parameter_constraint until "allow_empty_string" : true
+# @parameter_constraint until "select" : [ "", "any", "ok" ]
+# @parameter unique_id      To identify the command (allows to change the command without losing track)


shouldn't it be optionnal, and default to command ?

would be better indeed!

ncharles

This is awesome ! just two question, about uniqueid, and the notreserved usage, and one requested change (permissions is changed)

amousset · 2018-10-18T20:13:18Z

Commit modified

amousset · 2018-10-18T20:18:23Z

Commit modified

Normation-Quality-Assistant · 2018-10-19T08:42:45Z

OK, merging this PR

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from e43e02c to 4e2d6c6 Compare October 17, 2018 10:37

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 4e2d6c6 to 69ae5a6 Compare October 17, 2018 10:43

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 69ae5a6 to 76b3e54 Compare October 17, 2018 10:54

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 76b3e54 to 314647f Compare October 17, 2018 15:00

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 314647f to 234dc15 Compare October 17, 2018 15:42

ncharles reviewed Oct 17, 2018

View reviewed changes

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 234dc15 to e2b6475 Compare October 18, 2018 10:27

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from e2b6475 to 979a997 Compare October 18, 2018 11:13

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 979a997 to fc816c3 Compare October 18, 2018 11:19

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from fc816c3 to 02b19f7 Compare October 18, 2018 11:35

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 02b19f7 to a3c92df Compare October 18, 2018 12:06

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from a3c92df to 63d5765 Compare October 18, 2018 12:32

ncharles reviewed Oct 18, 2018

View reviewed changes

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 63d5765 to 2b94157 Compare October 18, 2018 12:53

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 2b94157 to 899a3c5 Compare October 18, 2018 14:35

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 899a3c5 to 1838973 Compare October 18, 2018 15:03

ncharles approved these changes Oct 18, 2018

View reviewed changes

amousset added the qa: Can't merge label Oct 18, 2018

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 1838973 to 6e9d741 Compare October 18, 2018 16:07

amousset removed the qa: Can't merge label Oct 18, 2018

ncharles reviewed Oct 18, 2018

View reviewed changes

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 6e9d741 to 72f75f0 Compare October 18, 2018 20:13

Fixes #13667: Add condition_once and execute_once generic methods

06da08a

amousset force-pushed the ust_13667/add_condition_once_and_execute_once_generic_methods branch from 72f75f0 to 06da08a Compare October 18, 2018 20:18

ncharles approved these changes Oct 19, 2018

View reviewed changes

ncharles added the Ready for merge label Oct 19, 2018

Normation-Quality-Assistant merged commit 06da08a into Normation:branches/rudder/4.3 Oct 19, 2018

Fixes #13667: Add condition_once and execute_once generic methods #849

Fixes #13667: Add condition_once and execute_once generic methods #849

Conversation

amousset commented Oct 17, 2018

amousset commented Oct 17, 2018

amousset commented Oct 17, 2018

amousset commented Oct 17, 2018

amousset commented Oct 17, 2018

amousset commented Oct 17, 2018

amousset commented Oct 17, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amousset commented Oct 18, 2018

amousset commented Oct 18, 2018

amousset commented Oct 18, 2018

amousset commented Oct 18, 2018

amousset commented Oct 18, 2018

amousset commented Oct 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amousset commented Oct 18, 2018

amousset commented Oct 18, 2018

amousset commented Oct 18, 2018

Choose a reason for hiding this comment

amousset commented Oct 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ncharles left a comment

Choose a reason for hiding this comment

amousset commented Oct 18, 2018

amousset commented Oct 18, 2018

Normation-Quality-Assistant commented Oct 19, 2018