diff options
author | Niels de Vos <ndevos@redhat.com> | 2017-01-06 12:58:02 +0100 |
---|---|---|
committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-02-13 20:53:27 -0500 |
commit | 48dc0655e214d8e4d313ebf86b5aabf3dc4b078a (patch) | |
tree | 6a1823ea6fb8751135e6f550148aac9a443e95bd /tests/bugs/cli | |
parent | bd9adf99a2ca53dd18332957acb465f904ecd22c (diff) |
gfapi: create statedump when glusterd requests it
When GlusterD sends the STATEDUMP procedure to the libgfapi client, the
client checks if it matches the PID that should take the statedump. If
so, it will do a statedump for the glfs_t that is connected to this mgmt
connection.
> BUG: 1169302
> See-also: http://review.gluster.org/9228
> Signed-off-by: Poornima G <pgurusid@redhat.com>
> [ndevos: separated patch from 9228]
> Reviewed-on: https://review.gluster.org/16415
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
> Tested-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
> Reviewed-by: Prashanth Pai <ppai@redhat.com>
BUG: 1418981
Change-Id: I70d6a1f4f19d525377aebc8fa57f51e513b92d84
Signed-off-by: Shyam <srangana@redhat.com>
Reviewed-on: https://review.gluster.org/16602
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'tests/bugs/cli')
-rw-r--r-- | tests/bugs/cli/bug-1169302.c | 78 | ||||
-rwxr-xr-x | tests/bugs/cli/bug-1169302.t | 30 |
2 files changed, 101 insertions, 7 deletions
diff --git a/tests/bugs/cli/bug-1169302.c b/tests/bugs/cli/bug-1169302.c new file mode 100644 index 00000000000..aa9f950abf2 --- /dev/null +++ b/tests/bugs/cli/bug-1169302.c @@ -0,0 +1,78 @@ +#include <errno.h> +#include <stdio.h> +#include <signal.h> + +#include <glusterfs/api/glfs.h> +#include <glusterfs/api/glfs-handles.h> + +int keep_running = 1; + +void stop_running(int sig) +{ + if (sig == SIGTERM) + keep_running = 0; +} + +int +main (int argc, char *argv[]) +{ + glfs_t *fs = NULL; + int ret = 0; + glfs_fd_t *fd = NULL; + char *filename = NULL; + char *logfile = NULL; + char *host = NULL; + + if (argc != 5) { + return -1; + } + + host = argv[2]; + logfile = argv[3]; + filename = argv[4]; + + /* setup signal handler for exiting */ + signal (SIGTERM, stop_running); + + fs = glfs_new (argv[1]); + if (!fs) { + return -1; + } + + ret = glfs_set_volfile_server (fs, "tcp", host, 24007); + if (ret < 0) { + return -1; + } + + ret = glfs_set_logging (fs, logfile, 7); + if (ret < 0) { + return -1; + } + + ret = glfs_init (fs); + if (ret < 0) { + return -1; + } + + fd = glfs_creat (fs, filename, O_RDWR, 0644); + if (!fd) { + return -1; + } + + /* sleep until SIGTERM has been received */ + while (keep_running) { + sleep (1); + } + + ret = glfs_close (fd); + if (ret < 0) { + return -1; + } + + ret = glfs_fini (fs); + if (ret < 0) { + return -1; + } + + return 0; +} diff --git a/tests/bugs/cli/bug-1169302.t b/tests/bugs/cli/bug-1169302.t index 92252aa7887..24355e55646 100755 --- a/tests/bugs/cli/bug-1169302.t +++ b/tests/bugs/cli/bug-1169302.t @@ -7,7 +7,7 @@ function check_peers { $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l } -cleanup; +cleanup #setup cluster and test volume TEST launch_cluster 3; # start 3-node virtual cluster @@ -19,16 +19,32 @@ EXPECT_WITHIN $PROBE_TIMEOUT 2 check_peers; TEST $CLI_1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0 $H3:$B3/$V0 TEST $CLI_1 volume start $V0 -# there is no gfapi application to take statedumps yet, it will get added in -# the next patch, this only tests the CLI for correctness - -cleanup_statedump - +# test CLI parameter acceptance TEST ! $CLI_1 volume statedump $V0 client $H2:0 TEST ! $CLI_2 volume statedump $V0 client $H2:-1 TEST $CLI_3 volume statedump $V0 client $H2:765 TEST ! $CLI_1 volume statedump $V0 client $H2: TEST ! $CLI_2 volume statedump $V0 client +TEST ! $CLI_3 volume statedump $V0 client $H2 $GFAPI_PID + +# build and run a gfapi appliction for triggering a statedump +logdir=`gluster --print-logdir` +STATEDUMP_TIMEOUT=60 + +build_tester $(dirname $0)/bug-1169302.c -lgfapi +$(dirname $0)/bug-1169302 $V0 $H1 $logdir/bug-1169302.log testfile & GFAPI_PID=$! + +cleanup_statedump + +# Take the statedump of the process connected to $H1, it should match the +# hostname or IP-address with the connection from the bug-1169302 executable. +# In our CI it seems not possible to use $H0, 'localhost', $(hostname --fqdn) +# or even "127.0.0.1".... +TEST $CLI_3 volume statedump $V0 client $H1:$GFAPI_PID +EXPECT_WITHIN $STATEDUMP_TIMEOUT "Y" path_exists $statedumpdir/glusterdump.$GFAPI_PID* + +kill $GFAPI_PID cleanup_statedump -cleanup; +cleanup_tester $(dirname $0)/bug-1169302 +cleanup |