From 3c41525001c49d7ada5f54bb3c97bf82909ee23e Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Tue, 9 Aug 2016 13:20:26 +0300 Subject: gfapi: add missing glfs_truncate Change-Id: I80b016090a4d9d86278a0a5144dd58c0cbfe9bb2 BUG: 1365489 Signed-off-by: Jeff Darcy Signed-off-by: Oleksandr Natalenko Reviewed-on: http://review.gluster.org/13927 Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Kaleb KEITHLEY --- api/src/gfapi.aliases | 2 +- api/src/gfapi.map | 8 +++- api/src/glfs-fops.c | 44 ++++++++++++++++++++ api/src/glfs.h | 2 +- tests/basic/gfapi/gfapi-trunc.c | 90 +++++++++++++++++++++++++++++++++++++++++ tests/basic/gfapi/gfapi-trunc.t | 29 +++++++++++++ 6 files changed, 171 insertions(+), 4 deletions(-) create mode 100644 tests/basic/gfapi/gfapi-trunc.c create mode 100644 tests/basic/gfapi/gfapi-trunc.t diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index 4a8bdcfa2a4..365d170230b 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -33,7 +33,7 @@ _pub_glfs_pwritev _glfs_pwritev$GFAPI_3.4.0 _pub_glfs_preadv_async _glfs_preadv_async$GFAPI_3.4.0 _pub_glfs_pwritev_async _glfs_pwritev_async$GFAPI_3.4.0 _pub_glfs_lseek _glfs_lseek$GFAPI_3.4.0 -_pub_glfs_truncate _glfs_truncate$GFAPI_3.4.0 +_pub_glfs_truncate _glfs_truncate$GFAPI_3.7.15 _pub_glfs_ftruncate _glfs_ftruncate$GFAPI_3.4.0 _pub_glfs_ftruncate_async _glfs_ftruncate_async$GFAPI_3.4.0 _pub_glfs_lstat _glfs_lstat$GFAPI_3.4.0 diff --git a/api/src/gfapi.map b/api/src/gfapi.map index 37a26c66467..b03e6212694 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -39,7 +39,6 @@ GFAPI_3.4.0 { glfs_preadv_async; glfs_pwritev_async; glfs_lseek; - glfs_truncate; glfs_ftruncate; glfs_ftruncate_async; glfs_lstat; @@ -169,7 +168,12 @@ GFAPI_3.7.4 { glfs_h_lookupat; } GFAPI_PRIVATE_3.7.0; +GFAPI_3.7.15 { + global: + glfs_truncate; +} GFAPI_3.7.4; + GFAPI_4.0.0 { global: glfs_ipc; -} GFAPI_3.7.4; +} GFAPI_3.7.15; diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index dfa26aae82e..18bac8195d0 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -1570,6 +1570,50 @@ invalid_fs: GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate, 3.4.0); +int +pub_glfs_truncate (struct glfs *fs, const char *path, off_t length) +{ + int ret = -1; + xlator_t *subvol = NULL; + loc_t loc = {0, }; + struct iatt iatt = {0, }; + int reval = 0; + + DECLARE_OLD_THIS; + __GLFS_ENTRY_VALIDATE_FS (fs, invalid_fs); + + subvol = glfs_active_subvol (fs); + if (!subvol) { + ret = -1; + errno = EIO; + goto out; + } +retry: + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + + ESTALE_RETRY (ret, errno, reval, &loc, retry); + + if (ret) + goto out; + + ret = syncop_truncate (subvol, &loc, length, NULL, NULL); + DECODE_SYNCOP_ERR (ret); + + ESTALE_RETRY (ret, errno, reval, &loc, retry); +out: + loc_wipe (&loc); + + glfs_subvol_done (fs, subvol); + + __GLFS_EXIT_FS; + +invalid_fs: + return ret; +} + +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_truncate, 3.7.15); + + static int glfs_ftruncate_async_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, diff --git a/api/src/glfs.h b/api/src/glfs.h index 21dbc9b85ee..30600a79c32 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -560,7 +560,7 @@ off_t glfs_lseek (glfs_fd_t *fd, off_t offset, int whence) __THROW GFAPI_PUBLIC(glfs_lseek, 3.4.0); int glfs_truncate (glfs_t *fs, const char *path, off_t length) __THROW - GFAPI_PUBLIC(glfs_truncate, 3.4.0); + GFAPI_PUBLIC(glfs_truncate, 3.7.15); int glfs_ftruncate (glfs_fd_t *fd, off_t length) __THROW GFAPI_PUBLIC(glfs_ftruncate, 3.4.0); diff --git a/tests/basic/gfapi/gfapi-trunc.c b/tests/basic/gfapi/gfapi-trunc.c new file mode 100644 index 00000000000..af187e50c78 --- /dev/null +++ b/tests/basic/gfapi/gfapi-trunc.c @@ -0,0 +1,90 @@ +#include +#include +#include +#include +#include +#include + +#define VALIDATE_AND_GOTO_LABEL_ON_ERROR(func, ret, label) do { \ + if (ret < 0) { \ + fprintf (stderr, "%s : returned error %d (%s)\n", \ + func, ret, strerror (errno)); \ + goto label; \ + } \ + } while (0) + +#define WRITE_SIZE 4096 +#define TRUNC_SIZE 1234 +/* Make sure TRUNC_SIZE is smaller than WRITE_SIZE at compile time. */ +typedef char _size_check[WRITE_SIZE-TRUNC_SIZE]; + +int +main (int argc, char *argv[]) +{ + int ret = -1; + int flags = O_RDWR|O_SYNC; + glfs_t *fs = NULL; + glfs_fd_t *fd1 = NULL; + char *volname = NULL; + char *logfile = NULL; + const char *filename = "file_tmp"; + const char buff[WRITE_SIZE]; + struct stat sb; + + if (argc != 3) { + fprintf (stderr, "Invalid argument\n"); + return 1; + } + + volname = argv[1]; + logfile = argv[2]; + + fs = glfs_new (volname); + if (!fs) + VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_new", ret, out); + + ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007); + VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_set_volfile_server", ret, out); + + ret = glfs_set_logging (fs, logfile, 7); + VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_set_logging", ret, out); + + ret = glfs_init (fs); + VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_init", ret, out); + + fd1 = glfs_creat(fs, filename, flags, 0644); + if (fd1 == NULL) { + ret = -1; + VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_creat", ret, out); + } + + ret = glfs_write (fd1, buff, WRITE_SIZE, flags); + VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_write", ret, out); + + ret = glfs_truncate (fs, filename, TRUNC_SIZE); + VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_truncate", ret, out); + + ret = glfs_fstat (fd1, &sb); + VALIDATE_AND_GOTO_LABEL_ON_ERROR ("glfs_fstat", ret, out); + + if (sb.st_size != TRUNC_SIZE) { + fprintf (stderr, "wrong size %jd should be %jd\n", + (intmax_t)sb.st_size, (intmax_t)2048); + ret = -1; + } + +out: + if (fd1 != NULL) + glfs_close(fd1); + if (fs) { + /* + * If this fails (as it does on Special Snowflake NetBSD for no + * good reason), it shouldn't affect the result of the test. + */ + (void) glfs_fini(fs); + } + + return ret; +} + + diff --git a/tests/basic/gfapi/gfapi-trunc.t b/tests/basic/gfapi/gfapi-trunc.t new file mode 100644 index 00000000000..134e78de1fd --- /dev/null +++ b/tests/basic/gfapi/gfapi-trunc.t @@ -0,0 +1,29 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc + +TEST glusterd + +TEST $CLI volume create $V0 ${H0}:$B0/brick1; +EXPECT 'Created' volinfo_field $V0 'Status'; + +TEST $CLI volume start $V0; +EXPECT 'Started' volinfo_field $V0 'Status'; + +logdir=`gluster --print-logdir` + +# Special Snowflake NetBSD isn't set up to run tests that involve building +# executables. Until that's fixed somewhere else, patch things up here. +if [ x"$OSTYPE" = x"NetBSD" ]; then + mkdir -p $logdir + extra_cflags="-I/build/install/include -L/build/install/lib" +fi + +build_tester $(dirname $0)/gfapi-trunc.c -lgfapi ${extra_cflags} + +TEST ./$(dirname $0)/gfapi-trunc $V0 $logdir/gfapi-trunc.log + +cleanup_tester $(dirname $0)/gfapi-trunc + +cleanup; -- cgit