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.

Sign up for GitHub

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

Jump to bottom

fix: better cancelled jobs handling #5631

Merged
merged 1 commit into from
May 3, 2022
Merged

fix: better cancelled jobs handling #5631

merged 1 commit into from
May 3, 2022

Conversation

rgrinberg
Copy link
Member

@rgrinberg rgrinberg commented Apr 27, 2022 •
edited
Loading

  • do not print output of cancelled jobs
  • Process.run will not return with a value signalling success if the job was cancelled after the process terminated.

Should help out with #5482.

@rgrinberg rgrinberg requested a review from snowleopard April 27, 2022 20:22
@rgrinberg
Copy link
Member Author

ping on this fix @snowleopard. It fixes quite an annoying issue.

@rgrinberg rgrinberg added this to the 3.2.0 milestone May 3, 2022
snowleopard
snowleopard requested changes May 3, 2022
View reviewed changes
Copy link
Collaborator

@snowleopard snowleopard left a comment

Choose a reason for hiding this comment

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

I left some questions/comments in the code.

The main issue is that it seems like the change you are making doesn't achieve the second bullet point from the PR description?

@rgrinberg rgrinberg force-pushed the ps/rr/fix__better_cancelled_jobs_handling branch from a5d2e71 to 9f86132 Compare May 3, 2022 17:49
@rgrinberg
Copy link
Member Author

I clarified the commit and added some comments. I also added a CHANGES entry that claims we're fixing #5482. Perhaps a bit optimistic, but we can revisit if the problem comes back.

@rgrinberg rgrinberg linked an issue May 3, 2022 that may be closed by this pull request
Error getting duplicated in dune b -w watch mode #5482
Closed
snowleopard
snowleopard approved these changes May 3, 2022
View reviewed changes
Copy link
Collaborator

@snowleopard snowleopard 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 now, thanks for the comments!

@snowleopard
Copy link
Collaborator

I clarified the commit and added some comments. I also added a CHANGES entry that claims we're fixing #5482. Perhaps a bit optimistic, but we can revisit if the problem comes back.

Agreed, it does look like this PR can fix it.

@rgrinberg
fix: better cancelled jobs handling
0500ce2 
* do not print output of cancelled jobs
* [Process.run] will not return with a value signalling success if the
  job was cancelled after the process terminated.

Signed-off-by: Rudi Grinberg <[email protected]>

ps-id: F1DB0788-E5E1-4B5E-9544-D53F147D7B5A
@rgrinberg rgrinberg force-pushed the ps/rr/fix__better_cancelled_jobs_handling branch from 9f86132 to 0500ce2 Compare May 3, 2022 18:31
@rgrinberg rgrinberg merged commit 0500ce2 into main May 3, 2022
@rgrinberg rgrinberg deleted the ps/rr/fix__better_cancelled_jobs_handling branch May 3, 2022 18:31
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request May 17, 2022
@rgrinberg
[new release] xdg, stdune, ordering, ocamlc-loc, fiber, dyn, dune, du…
a6c2fc7 
…ne-site, dune-rpc, dune-rpc-lwt, dune-private-libs, dune-glob, dune-configurator, dune-build-info, dune-action-plugin and chrome-trace (3.2.0)

CHANGES:

- Fixed ``dune describe workspace --with-deps`` so that it correctly
  handles Reason files, as well as files any other dialect. (ocaml/dune#5701, @esope)

- Disable alerts when compiling code in vendored directories (ocaml/dune#5683,
  @NathanReb)

- Fixed ``dune describe --with-deps``, that crashed when some
  preprocessing was required in a dune file using ``per_module``.
  (ocaml/dune#5682, fixes ocaml/dune#5680, @esope)

- Add `$ dune describe pp` to print the preprocssed ast of sources. (ocaml/dune#5615,
  fixes ocaml/dune#4470, @cannorin)

- Report dune file evaluation errors concurrently. In the same way we report
  build errors. (ocaml/dune#5655, @rgrinberg)

- Watch mode now default to clearing the terminal on rebuild (ocaml/dune#5636, fixes,
  ocaml/dune#5216, @rgrinberg)

- The output of jobs that finished but were cancelled is now omitted. (ocaml/dune#5631,
  fixes ocaml/dune#5482, @rgrinberg)

- Allows to configure all the default destination directories with `./configure`
  (adds `bin`, `sbin`, `data`, `libexec`). Use `OPAM_SWITCH_PREFIX` instead of
  calling the `opam` binaries in `dune install`. Fix handling of multiple
  `libdir` in `./configure` for handling `/usr/lib/ocaml/` and
  `/usr/local/lib/ocaml`. In `dune install` forbid relative directories in
  `libdir`, `docdir` and others specific directory setting because their handling
  was inconsistent (ocaml/dune#5516, fixes ocaml/dune#3978 and ocaml/dune#5455, @bobot)

- `--terminal-persistence=clear-on-rebuild` will no longer destroy scrollback
  on some terminals (ocaml/dune#5646, @rgrinberg)

- Add a fmt command as a shortcut of `dune build @fmt --auto-promote` (ocaml/dune#5574,
  @tmattio)

- Watch mode now tracks copied external files, external directories for
  dependencies, dune files in OCaml syntax, files used by `include` stanzas,
  dune-project, opam files, libraries builtin with compiler, and foreign
  sources (ocaml/dune#5627, ocaml/dune#5645, ocaml/dune#5652, ocaml/dune#5656, ocaml/dune#5672, ocaml/dune#5691, ocaml/dune#5722, fixes ocaml/dune#5331,
  @rgrinberg)

- Improve metrics for cram tests. Include test names in the event and add a
  category for cram tests (ocaml/dune#5626, @rgrinberg)

- Allow specifying multiple licenses in project file (ocaml/dune#5579, fixes ocaml/dune#5574,
  @liyishuai)

- Match `glob_files` only against files in external directories (ocaml/dune#5614, fixes
  ocaml/dune#5540, @rgrinberg)

- Add pid's to chrome trace output (ocaml/dune#5617, @rgrinberg)

- Fix race when creating local cache directory (ocaml/dune#5613, fixes ocaml/dune#5461, @rgrinberg)

- Add `not` to boolean expressions (ocaml/dune#5610, fix ocaml/dune#5503, @rgrinberg)

- Fix relative dependencies outside the workspace (ocaml/dune#4035, fixes ocaml/dune#5572, @bobot)

- Allow to specify `--prefix` via the environment variable
  `DUNE_INSTALL_PREFIX` (ocaml/dune#5589, @vapourismo)

- Dune-site.plugin: add support for `archive(native|byte, plugin)` used in the
  wild before findlib documented `plugin(native|byte)` in 2015 (ocaml/dune#5518, @bobot)

- Fix a bug where Dune would not correctly interpret `META` files in alternative
  layout (ie when the META file is named `META.$pkg`). The `Llvm` bindings were
  affected by this issue. (ocaml/dune#5619, fixes ocaml/dune#5616, @nojb)

- Support `(binaries)` in `(env)` in dune-workspace files (ocaml/dune#5560, fix ocaml/dune#5555,
  @emillon)

- (mdx) stanza: add support for (locks). (ocaml/dune#5628, fixes ocaml/dune#5489, @emillon)

- (mdx) stanza: support including files in different directories using relative
  paths, and provide better error messages when paths are invalid (ocaml/dune#5703, ocaml/dune#5704,
  fixes ocaml/dune#5596, @emillon)

- Fix ctypes rules for external lib names which aren't valid ocaml names
  (ocaml/dune#5667, fixes ocaml/dune#5511, @Khady)
@rgrinberg rgrinberg mentioned this pull request May 17, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@snowleopard snowleopard snowleopard approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.2.0
Development

Successfully merging this pull request may close these issues.

Error getting duplicated in dune b -w watch mode
2 participants
@rgrinberg @snowleopard