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

zpool_influxdb: move to libexec dir #11224

Merged
merged 2 commits into from
Nov 28, 2020

Conversation

snajpa
Copy link
Contributor

@snajpa snajpa commented Nov 20, 2020

Motivation and Context

Move zpool_influxdb to libexec dir, as per following discussions:

#11156
#11160

Signed-off-by: Pavel Snajdr [email protected]

Description

I've used libexec_PROGRAMS autotools magic to install directly to libexec folder, I hope that is OK. It seemed more in-line with what we want to do here, I didn't want to create potentially unnecessary subfolder. Also added benefit is fewer lines for the install phase.

How Has This Been Tested?

Builds & works locally, waiting for bots to confirm the tests work OK with new LIBEXEC_DIR variable.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Nov 20, 2020
@snajpa
Copy link
Contributor Author

snajpa commented Nov 21, 2020

I wonder where the problem is, locally the test is passing:

snajpa@kerneldev:~/zfs (vpsadminos-devel)$ ./scripts/zfs-tests.sh -vx -t tests/functional/zpool_influxdb/zpool_influxdb

--- Cleanup ---
Removing pool(s):      
Removing dm(s):       
Removing loopback(s):  
Removing files(s):     

--- Configuration ---
Runfiles:        /var/tmp/zfs-tests.253876.run
STF_TOOLS:       /home/snajpa/zfs/tests/test-runner
STF_SUITE:       /home/snajpa/zfs/tests/zfs-tests
STF_PATH:        /home/snajpa/zfs/bin
FILEDIR:         /var/tmp
FILES:           /var/tmp/file-vdev0 /var/tmp/file-vdev1 /var/tmp/file-vdev2
LOOPBACKS:       /dev/loop6 /dev/loop7 /dev/loop8
DISKS:           loop6 loop7 loop8
NUM_DISKS:       3
FILESIZE:        4G
ITERATIONS:      1
TAGS:            functional
STACK_TRACER:    no
Keep pool(s):    rpool
Missing util(s): setenforce

/home/snajpa/zfs/tests/test-runner/bin/test-runner.py  -c "/var/tmp/zfs-tests.253876.run" -T "functional" -i "/home/snajpa/zfs/tests/zfs-tests" -I "1"
Test: /home/snajpa/zfs/tests/zfs-tests/tests/functional/zpool_influxdb/setup (run as root) [00:00] [PASS]
Test: /home/snajpa/zfs/tests/zfs-tests/tests/functional/zpool_influxdb/zpool_influxdb (run as root) [00:00] [PASS]
Test: /home/snajpa/zfs/tests/zfs-tests/tests/functional/zpool_influxdb/cleanup (run as root) [00:00] [PASS]

Results Summary
PASS       3

Running Time:   00:00:01
Percent passed: 100.0%
Log directory:  /var/tmp/test_results/20201121T214248

Tests with results other than PASS that are expected:

Tests with result of PASS that are unexpected:

Tests with results other than PASS that are unexpected:

@behlendorf
Copy link
Contributor

@snajpa you should be able to cherry-pick commit 416f97a in to your PR to resolve the test failures. It also moves zpool_influxdb under /usr/libexec/zfs/.

snajpa and others added 2 commits November 27, 2020 17:34
Move zpool_influxdb to libexec dir, as per following discussions:

openzfs#11156
openzfs#11160

Signed-off-by: Pavel Snajdr <[email protected]>
- Move the zpool_influxdb command to /usr/libexec/zfs.
  Packages and generally expected to use a subdirectory.

- Include the /usr/libexec/zfs path in the system search
  directory when running the test suite.

Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Pavel Snajdr <[email protected]>
@snajpa snajpa force-pushed the zpool_influxdb-libexec branch from ff4e6f3 to 2895099 Compare November 27, 2020 16:34
@snajpa
Copy link
Contributor Author

snajpa commented Nov 27, 2020

@behlendorf thanks a million, I'm sorry for the delays :(

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Nov 28, 2020
@behlendorf behlendorf merged commit 52c8537 into openzfs:master Nov 28, 2020
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
Move the zpool_influxdb command to /usr/libexec/zfs,
and include the /usr/libexec/zfs path in the system search
directory when running the test suite.

Reviewed-by: Richard Elling <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Pavel Snajdr <[email protected]>
Closes openzfs#11156
Closes openzfs#11160
Closes openzfs#11224
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
Move the zpool_influxdb command to /usr/libexec/zfs,
and include the /usr/libexec/zfs path in the system search
directory when running the test suite.

Reviewed-by: Richard Elling <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Pavel Snajdr <[email protected]>
Closes openzfs#11156
Closes openzfs#11160
Closes openzfs#11224
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Jun 11, 2021
Move the zpool_influxdb command to /usr/libexec/zfs,
and include the /usr/libexec/zfs path in the system search
directory when running the test suite.

Reviewed-by: Richard Elling <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Pavel Snajdr <[email protected]>
Closes openzfs#11156
Closes openzfs#11160
Closes openzfs#11224
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants