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 glusterfind fixes cherry-pick for 17.09 #29160

Merged
merged 4 commits into from Sep 10, 2017

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Sep 9, 2017

Motivation for this change

Cherry-pick of #29071.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

CC @bachp @joachifm

@mention-bot
Copy link

@nh2, thanks for your PR! By analyzing the history of the files in this pull request, we identified @proger, @7c6f434c and @bachp to be potential reviewers.

@joachifm
Copy link
Contributor

joachifm commented Sep 9, 2017

Thank you. Please use git cherry-pick -x to preserve the link to the original commits.

@nh2
Copy link
Contributor Author

nh2 commented Sep 9, 2017

@joachifm OK, will fix.

Fixes error

  File "/nix/store/lxpsl84km87xpk59nai6a33ihgpfs7qr-glusterfs-3.10.2/libexec/glusterfs/glusterfind/changelog.py", line 105, in populate_pgfid_and_inodegfid
      file_xattrs = xattr.list(p)
  AttributeError: 'module' object has no attribute 'list'

when using `glusterfind pre`.

(cherry picked from commit 8e329da)
See: https://bugzilla.redhat.com/show_bug.cgi?id=1489610

Also add patch to correctly log stderr from remote nodes
when glusterfind fails.
This, too, should be removed when fixed upstream.

(cherry picked from commit e7325f8)
This fixes:

  Traceback (most recent call last):
    File "/nix/store/7f9arl3f9xyj8sm05mkanh2mlp217192-glusterfs-3.10.2/libexec/glusterfs/glusterfind/changelog.py", line 22, in <module>
      import libgfchangelog
    File "/nix/store/7f9arl3f9xyj8sm05mkanh2mlp217192-glusterfs-3.10.2/libexec/glusterfs/glusterfind/libgfchangelog.py", line 21, in <module>
      libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL)
    File "/nix/store/nlyr5ankhi7yvva8zndi718zj37js270-python-2.7.13-env/lib/python2.7/ctypes/__init__.py", line 362, in __init__
      self._handle = _dlopen(self._name, mode)
  OSError: libgfchangelog.so: cannot open shared object file: No such file or directory
  Connection to 10.0.0.2 closed.

when running `glusterfind pre`.

Done by setting PYTHONPATH/LD_LIBRARY_PATH as for the other
Python scripts.

(cherry picked from commit abc96aa)
@nh2 nh2 force-pushed the glusterfs-glusterfind-dirs-17.09 branch from 1e5bf25 to e75b307 Compare September 9, 2017 21:01
@nh2
Copy link
Contributor Author

nh2 commented Sep 9, 2017

@joachifm Done.

@joachifm joachifm added this to the 17.09 milestone Sep 9, 2017
@fpletz
Copy link
Member

fpletz commented Sep 10, 2017

Thanks!

@fpletz fpletz merged commit cf9c019 into NixOS:release-17.09 Sep 10, 2017
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.

None yet

4 participants