puppet.run issues misleading error message

[internetstaff]

We're having a problem where puppet.run works, but prints out this error on the master:

ERROR: Minions returned with non-zero exit code

This happens when Puppet makes a change and returns a '2' instead of a 0.

In puppet.py, run() properly modifies retcode to '0' when it sees a '2', since that indicates a successful run.

However, in minion.py, _thread_return injects the original return code with this:

                ret['retcode'] = minion_instance.functions.pack['__context__'].get(
                    'retcode',
                    0
                )

'ret' ends up being changed from:

{'return': {'pid': 7197,
            'retcode': 0,
            'stderr': '',
            'stdout': "blah blah blah"},
 'success': False}

to:

{'retcode': 2,
 'return': {'pid': 7197,
            'retcode': 0,
            'stderr': '',
            'stdout': "blah blah blah"},
 'success': True}

The salt master then uses the top level 'retcode' to print the misleading error above, causing operators and programs parsing the output to incorrectly conclude there was a failure.

If I comment out the functions.pack section, everything works as expected.

[jfindlay]

@internetstaff, thanks for the report. This issue is related to #20850.

[stale]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

If this issue is closed prematurely, please leave a comment and we will gladly reopen the issue.