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

Fix simulator and re-enable sim integration tests #250

Merged
merged 7 commits into from
Jun 27, 2017

Conversation

SteVwonder
Copy link
Member

Problems with the simulator were unearthed in #246 since this was the first PR to sched in several months. We temporarily disabled the simulator integration tests until the problems were resolved. This PR fixes those problems and re-enables the simulator integration tests.

I also refactored a few functions in the simulator to simplify their main loops and logging (I can put these changes into a separate PR, if desired)

To avoid this situation in the future, we have setup a nightly cron job on Travis CI for flux-sched.

Fixes #249

rather than using `flux_msg_create` to create the message, followed by
`flux_msg_set_topic`, etc, just use `flux_request_encode`.  This
reduces the LOC and enables message routing for the RPC.
a value within the zhash, rather than the zhash object itself, was
being passed as an argument to `zhash_cursor`, causing a
segfault. Simulator integration tests work now.
If there are no jobs left to be submitted and the submit module is
triggered anyways, then reply to the `sim` module with `next_time` set
to -1
Rather than using multiple while loops, reduce down to a single for
loop. The refactor also removes the need for calling `zhash_keys`.
IMO, pulling the complex conditional logic out into inline functions
greatly improves the readability of the code
@SteVwonder SteVwonder requested review from garlick and lipari June 27, 2017 22:19
@coveralls
Copy link

Coverage Status

Coverage increased (+18.004%) to 73.428% when pulling a7a4d38 on SteVwonder:fix-simulator into 14f793a on flux-framework:master.

Copy link
Member

@garlick garlick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm good with this as is.

Copy link
Contributor

@lipari lipari left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@lipari lipari merged commit f5a7bcb into flux-framework:master Jun 27, 2017
@garlick
Copy link
Member

garlick commented Jun 27, 2017

Nice job @SteVwonder, thanks for running this down and sorry we broke the world.

@grondo grondo mentioned this pull request Aug 23, 2017
@SteVwonder SteVwonder deleted the fix-simulator branch February 16, 2019 00:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FAIL: t2000-fcfs.t 2 - sim: scheduled and ran all jobs
4 participants