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

glusterfs: 4.0 -> 6.5 #66736

Merged
merged 2 commits into from Aug 20, 2019
Merged

glusterfs: 4.0 -> 6.5 #66736

merged 2 commits into from Aug 20, 2019

Conversation

markuskowa
Copy link
Member

Motivation for this change

GlusterFS is on a really old version. Added a simple nixos test.

Probably needs some testing. Feedback is welcome.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @7c6f434c @nh2

@7c6f434c
Copy link
Member

(I guess I have lost track even of the list of packages I have auto-updated at some point…)

Argh, they don't have a convenient changelog. But it does seem nothing breaking has happenned, and the test is nice, a separate thanks for that (I have never actually used GlusterFS in a way that would require noticeably more than what this test checks).

@mmahut
Copy link
Member

mmahut commented Aug 17, 2019

@GrahamcOfBorg test glusterfs

* remove patches (fixed upstream)
* python2 -> python3
Copy link
Contributor

@nh2 nh2 left a comment

Choose a reason for hiding this comment

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

Approving; I did not test it, but my concern with the not-yet-landed patch was addressed.

@7c6f434c 7c6f434c merged commit 0cbeac4 into NixOS:master Aug 20, 2019
@markuskowa markuskowa deleted the upd-gluster branch August 20, 2019 10:55
@markuskowa
Copy link
Member Author

@nh2 @7c6f434c thanks for your feedback! I will do some more VM testing to make sure it is stable for 19.09.

@danbst
Copy link
Contributor

danbst commented Aug 20, 2019

This broke Xen build: https://hydra.nixos.org/build/98992176/nixlog/1/tail

/nix/store/kjf71zvyb621fp1hd63c8w2w67krmnnj-glusterfs-6.5/include/glusterfs/api/glfs.h:747:1: note: expected 'glfs_io_cbk {aka void (*)(struct glfs_fd *, long int,  struct glfs_stat *, struct glfs_stat *, void *)}' but argument is of type 'void (*)(struct glfs_fd *, ssize_t,  void *) {aka void (*)(struct glfs_fd *, long int,  void *)}'
 glfs_pwritev_async(glfs_fd_t *fd, const struct iovec *iov, int count,
 ^~~~~~~~~~~~~~~~~~
/build/xen-4.8.3/tools/qemu-xen/block/gluster.c:984:33: warning: passing argument 6 of 'glfs_preadv_async' from incompatible pointer type [-Wincompatible-pointer-types]
                                 gluster_finish_aiocb, &acb);
                                 ^~~~~~~~~~~~~~~~~~~~
In file included from /build/xen-4.8.3/tools/qemu-xen/block/gluster.c:11:0:

@markuskowa
Copy link
Member Author

Quick googling tells that this incompatability has been introduced in with glusterfs v6. Qemu also had to fix it: https://patchwork.kernel.org/patch/10839611/
Is there a patch for Xen-4.8 to fix this?

@danbst
Copy link
Contributor

danbst commented Aug 20, 2019

@markuskowa yes, this patch is at https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=commit;h=0e3b891fefacc0e49f3c8ffa3a753b69eb7214d2, which is internal qemu which Xen uses for build

@markuskowa
Copy link
Member Author

@danbst would you mind opening a PR adding that patch? I am not familiar with Xen.

@danbst
Copy link
Contributor

danbst commented Aug 20, 2019

unfortunately I'm distant of that as well. But I can try to update Xen

danbst added a commit to danbst/nixpkgs that referenced this pull request Aug 20, 2019
It was broken during GlusterFs upgrade: NixOS#66736
@danbst danbst mentioned this pull request Aug 20, 2019
10 tasks
flokli added a commit that referenced this pull request Aug 21, 2019
* xen: 4.8.3 -> 4.8.5, unbreak

It was broken during GlusterFs upgrade: #66736
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants