Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Back-port #48193 to 2017.7 #48295

Merged
merged 3 commits into from Jun 26, 2018
Merged

Back-port #48193 to 2017.7 #48295

merged 3 commits into from Jun 26, 2018

Commits on Jun 25, 2018

  1. Properly wait on returns in saltnado

    This was broken because the behavior was to simply check the ckminions
    and wait for only those returns to complete. This works assuming
    ckminions is accurate (which there are many cases where it isn't, such
    as syndics).
    
    _disbatch_local's waiting on returns needs to match LocalClient's
    behavior (namely that in get_iter_returns). This means we are allowed to
    return when (1) we have waitged the min_wait_time (0 if not a syndic)
    (2) no minions are running the job (3) all minions we saw running it are
    done running the job. The only method allowed for earlier termination is
    if the gather_job_timeout is exceeded.
    
    Fixes saltstack#42659
    jacksontj authored and rallytime committed Jun 25, 2018
    Copy the full SHA
    d0a9853 View commit details
    Browse the repository at this point in the history
  2. Properly configure syndic in test case

    Without this option we aren't really a syndic and it won't wait
    jacksontj authored and rallytime committed Jun 25, 2018
    Copy the full SHA
    c0180ff View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    352fe33 View commit details
    Browse the repository at this point in the history