* (C) Copyright 2012 Commissariat a l'energie atomique et aux energies
* alternatives
*
+ * Copyright (c) 2013, 2015, Intel Corporation.
*/
/* HSM copytool program for POSIX filesystem-based HSM's.
*
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
+#include <ctype.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
+#include <string.h>
#include <dirent.h>
#include <errno.h>
+#include <getopt.h>
+#include <pthread.h>
#include <time.h>
+#include <unistd.h>
#include <utime.h>
+#include <signal.h>
#include <sys/time.h>
#include <sys/xattr.h>
#include <sys/syscall.h>
#include <sys/types.h>
+
+#include <libcfs/util/string.h>
#include <lustre/lustre_idl.h>
#include <lustre/lustreapi.h>
# define NSEC_PER_SEC 1000000000UL
#endif
-/* copytool uses a 32b bitmask field to register with kuc
- * archive num = 0 => all
- * archive num from 1 to 32
- */
-#define MAX_ARCHIVE_CNT (sizeof(__u32) * 8)
-
enum ct_action {
CA_IMPORT = 1,
CA_REBIND,
int o_verbose;
int o_copy_xattrs;
int o_archive_cnt;
- int o_archive_id[MAX_ARCHIVE_CNT];
+ int o_archive_id[LL_HSM_MAX_ARCHIVE];
int o_report_int;
unsigned long long o_bandwidth;
size_t o_chunk_size;
long_opts, NULL)) != -1) {
switch (c) {
case 'A':
- if ((opt.o_archive_cnt >= MAX_ARCHIVE_CNT) ||
- (atoi(optarg) >= MAX_ARCHIVE_CNT)) {
+ if ((opt.o_archive_cnt >= LL_HSM_MAX_ARCHIVE) ||
+ (atoi(optarg) >= LL_HSM_MAX_ARCHIVE)) {
rc = -E2BIG;
CT_ERROR(rc, "archive number must be less"
- "than %zu", MAX_ARCHIVE_CNT);
+ "than %zu", LL_HSM_MAX_ARCHIVE);
return rc;
}
opt.o_archive_id[opt.o_archive_cnt] = atoi(optarg);
CT_TRACE("action=%d src=%s dst=%s mount_point=%s",
opt.o_action, opt.o_src, opt.o_dst, opt.o_mnt);
- if (!opt.o_dry_run && opt.o_hsm_root == NULL) {
+ if (opt.o_hsm_root == NULL) {
rc = -EINVAL;
CT_ERROR(rc, "must specify a root directory for the backend");
return rc;
struct stat dst_st;
char *buf = NULL;
__u64 write_total = 0;
- __u64 length;
+ __u64 length = hai->hai_extent.length;
time_t last_report_time;
int rc = 0;
double start_ct_now = ct_now();
return rc;
}
+ if (hai->hai_extent.offset > (__u64)src_st.st_size) {
+ rc = -EINVAL;
+ CT_ERROR(rc, "Trying to start reading past end (%ju > "
+ "%jd) of '%s' source file",
+ (uintmax_t)hai->hai_extent.offset,
+ (intmax_t)src_st.st_size, src);
+ return rc;
+ }
+
if (fstat(dst_fd, &dst_st) < 0) {
rc = -errno;
CT_ERROR(rc, "cannot stat '%s'", dst);
return rc;
}
- rc = lseek(src_fd, hai->hai_extent.offset, SEEK_SET);
- if (rc < 0) {
- rc = -errno;
- CT_ERROR(rc,
- "cannot seek for read to "LPU64" (len %jd) in '%s'",
- hai->hai_extent.offset, (intmax_t)src_st.st_size, src);
- return rc;
- }
-
/* Don't read beyond a given extent */
- length = min(hai->hai_extent.length, src_st.st_size);
+ if (length > src_st.st_size - hai->hai_extent.offset)
+ length = src_st.st_size - hai->hai_extent.offset;
start_time = last_bw_print = last_report_time = time(NULL);
goto out;
}
- CT_TRACE("start copy of "LPU64" bytes from '%s' to '%s'",
- length, src, dst);
+ CT_TRACE("start copy of %ju bytes from '%s' to '%s'",
+ (uintmax_t)length, src, dst);
while (write_total < length) {
ssize_t rsize;
now = time(NULL);
if (now >= last_report_time + opt.o_report_int) {
last_report_time = now;
- CT_TRACE("%%"LPU64" ", 100 * write_total / length);
- he.length = write_total;
+ CT_TRACE("%%%ju ", (uintmax_t)(100 * write_total / length));
+ /* only give the length of the write since the last
+ * progress report */
+ he.length = offset - he.offset;
rc = llapi_hsm_action_progress(hcp, &he, length, 0);
if (rc < 0) {
/* Action has been canceled or something wrong
" '%s'->'%s' failed", src, dst);
goto out;
}
+ he.offset = offset;
}
rc = 0;
}
if (buf != NULL)
free(buf);
- CT_TRACE("copied "LPU64" bytes in %f seconds",
- length, ct_now() - start_ct_now);
+ CT_TRACE("copied %ju bytes in %f seconds",
+ (uintmax_t)length, ct_now() - start_ct_now);
return rc;
}
int rc;
CT_TRACE("Action completed, notifying coordinator "
- "cookie="LPX64", FID="DFID", hp_flags=%d err=%d",
- hai->hai_cookie, PFID(&hai->hai_fid),
+ "cookie=%#jx, FID="DFID", hp_flags=%d err=%d",
+ (uintmax_t)hai->hai_cookie, PFID(&hai->hai_fid),
hp_flags, -ct_rc);
ct_path_lustre(lstr, sizeof(lstr), opt.o_mnt, &hai->hai_fid);
rc = llapi_hsm_action_end(phcp, &hai->hai_extent, hp_flags, abs(ct_rc));
if (rc == -ECANCELED)
CT_ERROR(rc, "completed action on '%s' has been canceled: "
- "cookie="LPX64", FID="DFID, lstr, hai->hai_cookie,
- PFID(&hai->hai_fid));
+ "cookie=%#jx, FID="DFID, lstr,
+ (uintmax_t)hai->hai_cookie, PFID(&hai->hai_fid));
else if (rc < 0)
CT_ERROR(rc, "llapi_hsm_action_end() on '%s' failed", lstr);
else
goto fini_major;
}
- open_flags = O_WRONLY | O_NOFOLLOW | O_NONBLOCK;
+ open_flags = O_WRONLY | O_NOFOLLOW;
/* If extent is specified, don't truncate an old archived copy */
open_flags |= ((hai->hai_extent.length == -1) ? O_TRUNC : 0) | O_CREAT;
goto fini;
}
- src_fd = open(src, O_RDONLY | O_NOATIME | O_NONBLOCK | O_NOFOLLOW);
+ src_fd = open(src, O_RDONLY | O_NOATIME | O_NOFOLLOW);
if (src_fd < 0) {
rc = -errno;
CT_ERROR(rc, "cannot open '%s' for read", src);
int linkno = 0;
sprintf(fid, DFID, PFID(&hai->hai_fid));
- CT_TRACE("'%s' action %s reclen %d, cookie="LPX64,
+ CT_TRACE("'%s' action %s reclen %d, cookie=%#jx",
fid, hsm_copytool_action2name(hai->hai_action),
- hai->hai_len, hai->hai_cookie);
+ hai->hai_len, (uintmax_t)hai->hai_cookie);
rc = llapi_fid2path(opt.o_mnt, fid, path,
sizeof(path), &recno, &linkno);
if (rc < 0)
if (line)
free(line);
- /* return 0 if all rebinds were sucessful */
+ /* return 0 if all rebinds were successful */
CT_TRACE("%u lines read from '%s', %u rebind successful", nl, list, ok);
return ok == nl ? 0 : -1;
path[sizeof(path) - 1] = '\0';
}
- printf("max_sequence: "LPX64"\n", seq);
+ printf("max_sequence: %#jx\n", (uintmax_t)seq);
return 0;
}
* does successfully unmount and the mount is actually gone, but the
* mtab entry remains. So this just makes mtab happier. */
llapi_hsm_copytool_unregister(&ctdata);
+
+ /* Also remove fifo upon signal as during normal/error exit */
+ if (opt.o_event_fifo != NULL)
+ llapi_hsm_unregister_event_fifo(opt.o_event_fifo);
_exit(1);
}
/* Daemon waits for messages from the kernel; run it in the background. */
static int ct_run(void)
{
- int rc;
+ struct sigaction cleanup_sigaction;
+ int rc;
if (opt.o_daemonize) {
rc = daemon(1, 1);
return rc;
}
- signal(SIGINT, handler);
- signal(SIGTERM, handler);
+ memset(&cleanup_sigaction, 0, sizeof(cleanup_sigaction));
+ cleanup_sigaction.sa_handler = handler;
+ sigemptyset(&cleanup_sigaction.sa_mask);
+ sigaction(SIGINT, &cleanup_sigaction, NULL);
+ sigaction(SIGTERM, &cleanup_sigaction, NULL);
while (1) {
- struct hsm_action_list *hal;
- struct hsm_action_item *hai;
- int msgsize;
- int i = 0;
+ struct hsm_action_list *hal;
+ struct hsm_action_item *hai;
+ int msgsize;
+ int i = 0;
CT_TRACE("waiting for message from kernel");
git://git.whamcloud.com / fs / lustre-release.git / blobdiff