X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_coordinator.c;h=10932f2b2fbae69f3587d04c7e7b9b23774795f5;hp=651ed7ab35c03562d9b9e667ef2cc4021a2de3f7;hb=f625f670afbe954030ff81f0f8522137d6cdd335;hpb=ad1f3518fa418b75d83809ccfcf6dd1489493726 diff --git a/lustre/mdt/mdt_coordinator.c b/lustre/mdt/mdt_coordinator.c index 651ed7a..10932f2 100644 --- a/lustre/mdt/mdt_coordinator.c +++ b/lustre/mdt/mdt_coordinator.c @@ -20,10 +20,11 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2013, Intel Corporation. - * Use is subject to license terms. * Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies * alternatives + * + * Copyright (c) 2013, 2014, Intel Corporation. + * Use is subject to license terms. */ /* * lustre/mdt/mdt_coordinator.c @@ -184,8 +185,8 @@ static int mdt_coordinator_cb(const struct lu_env *env, cdt->cdt_max_requests) break; - /* first search if the request if known in the list we have - * build and if there is room in the request vector */ + /* first search whether the request is found in the list we + * have built and if there is room in the request vector */ empty_slot = -1; found = -1; for (i = 0; i < hsd->max_requests && @@ -227,9 +228,8 @@ static int mdt_coordinator_cb(const struct lu_env *env, RETURN(-ENOMEM); } hal->hal_version = HAL_VERSION; - strncpy(hal->hal_fsname, hsd->fs_name, - MTI_NAME_MAXLEN); - hal->hal_fsname[MTI_NAME_MAXLEN] = '\0'; + strlcpy(hal->hal_fsname, hsd->fs_name, + MTI_NAME_MAXLEN + 1); hal->hal_compound_id = larr->arr_compound_id; hal->hal_archive_id = larr->arr_archive_id; hal->hal_flags = larr->arr_flags; @@ -312,7 +312,7 @@ static int mdt_coordinator_cb(const struct lu_env *env, struct hsm_progress_kernel pgs; dump_llog_agent_req_rec("mdt_coordinator_cb(): " - "request timeouted, start " + "request timed out, start " "cleaning", larr); /* a too old cancel request just needs to be removed * this can happen, if copy tool does not support cancel @@ -330,13 +330,22 @@ static int mdt_coordinator_cb(const struct lu_env *env, */ rc = mdt_hsm_update_request_state(hsd->mti, &pgs, 0); if (rc) - CERROR("%s: Cannot cleanup timeouted request: " + CERROR("%s: Cannot cleanup timed out request: " DFID" for cookie "LPX64" action=%s\n", mdt_obd_name(mdt), PFID(&pgs.hpk_fid), pgs.hpk_cookie, hsm_copytool_action2name( larr->arr_hai.hai_action)); + if (rc == -ENOENT) { + /* The request no longer exists, forget + * about it, and do not send a cancel request + * to the client, for which an error will be + * sent back, leading to an endless cycle of + * cancellation. */ + RETURN(LLOG_DEL_RECORD); + } + /* add the cookie to the list of record to be * canceled by caller */ if (hsd->max_cookie == (hsd->cookie_cnt - 1)) { @@ -440,7 +449,7 @@ static int mdt_coordinator(void *data) struct mdt_thread_info *mti = data; struct mdt_device *mdt = mti->mti_mdt; struct coordinator *cdt = &mdt->mdt_coordinator; - struct hsm_scan_data hsd = { 0 }; + struct hsm_scan_data hsd = { NULL }; int rc = 0; ENTRY; @@ -534,7 +543,7 @@ static int mdt_coordinator(void *data) CDEBUG(D_HSM, "Found %d requests to send and %d" " requests to cancel\n", hsd.request_cnt, hsd.cookie_cnt); - /* first we cancel llog records of the timeouted requests */ + /* first we cancel llog records of the timed out requests */ if (hsd.cookie_cnt > 0) { rc = mdt_agent_record_update(mti->mti_env, mdt, hsd.cookies, @@ -869,9 +878,9 @@ int mdt_hsm_cdt_init(struct mdt_device *mdt) init_rwsem(&cdt->cdt_request_lock); mutex_init(&cdt->cdt_restore_lock); - CFS_INIT_LIST_HEAD(&cdt->cdt_requests); - CFS_INIT_LIST_HEAD(&cdt->cdt_agents); - CFS_INIT_LIST_HEAD(&cdt->cdt_restore_hdl); + INIT_LIST_HEAD(&cdt->cdt_requests); + INIT_LIST_HEAD(&cdt->cdt_agents); + INIT_LIST_HEAD(&cdt->cdt_restore_hdl); rc = lu_env_init(&cdt->cdt_env, LCT_MD_THREAD); if (rc < 0) @@ -1261,7 +1270,7 @@ static int hsm_cdt_request_completed(struct mdt_thread_info *mti, * ENOSYS only if does not support cancel */ /* this can also happen when cdt calls it to - * for a timeouted request */ + * for a timed out request */ *status = ARS_FAILED; /* to have a cancel event in changelog */ pgs->hpk_errval = ECANCELED; @@ -1391,7 +1400,7 @@ unlock: struct cdt_restore_handle *crh; /* restore in data FID done, we swap the layouts - * only if restore is successfull */ + * only if restore is successful */ if (pgs->hpk_errval == 0) { rc = hsm_swap_layouts(mti, &car->car_hai->hai_fid, &car->car_hai->hai_dfid, &mh); @@ -1702,7 +1711,7 @@ out: } /** - * check if a request is comptaible with file status + * check if a request is compatible with file status * \param hai [IN] request description * \param hal_an [IN] request archive number (not used) * \param rq_flags [IN] request flags @@ -1785,22 +1794,17 @@ static __u64 hsm_policy_str2bit(const char *name) * \param hexa [IN] print mask before bit names * \param buffer [OUT] string * \param count [IN] size of buffer - * \retval size filled in buffer */ -static int hsm_policy_bit2str(const __u64 mask, const bool hexa, char *buffer, - int count) +static void hsm_policy_bit2str(struct seq_file *m, const __u64 mask, + const bool hexa) { - int i, j, sz; - char *ptr; + int i, j; __u64 bit; ENTRY; - ptr = buffer; - if (hexa) { - sz = snprintf(buffer, count, "("LPX64") ", mask); - ptr += sz; - count -= sz; - } + if (hexa) + seq_printf(m, "("LPX64") ", mask); + for (i = 0; i < CDT_POLICY_SHIFT_COUNT; i++) { bit = (1ULL << i); @@ -1809,48 +1813,37 @@ static int hsm_policy_bit2str(const __u64 mask, const bool hexa, char *buffer, break; } if (bit & mask) - sz = snprintf(ptr, count, "[%s] ", - hsm_policy_names[j].name); + seq_printf(m, "[%s] ", hsm_policy_names[j].name); else - sz = snprintf(ptr, count, "%s ", - hsm_policy_names[j].name); - - ptr += sz; - count -= sz; + seq_printf(m, "%s ", hsm_policy_names[j].name); } /* remove last ' ' */ - *ptr = '\0'; - ptr--; - RETURN(ptr - buffer); + m->count--; + seq_putc(m, '\0'); } /* methods to read/write HSM policy flags */ -static int lprocfs_rd_hsm_policy(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int mdt_hsm_policy_seq_show(struct seq_file *m, void *data) { - struct mdt_device *mdt = data; + struct mdt_device *mdt = m->private; struct coordinator *cdt = &mdt->mdt_coordinator; - int sz; ENTRY; - sz = hsm_policy_bit2str(cdt->cdt_policy, false, page, count); - page[sz] = '\n'; - sz++; - page[sz] = '\0'; - *eof = 1; - RETURN(sz); + hsm_policy_bit2str(m, cdt->cdt_policy, false); + RETURN(0); } -static int lprocfs_wr_hsm_policy(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +mdt_hsm_policy_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct mdt_device *mdt = data; + struct seq_file *m = file->private_data; + struct mdt_device *mdt = m->private; struct coordinator *cdt = &mdt->mdt_coordinator; char *start, *token, sign; char *buf; __u64 policy; __u64 add_mask, remove_mask, set_mask; - int sz; int rc; ENTRY; @@ -1883,18 +1876,10 @@ static int lprocfs_wr_hsm_policy(struct file *file, const char *buffer, policy = hsm_policy_str2bit(token); if (policy == 0) { - char *msg; - - sz = PAGE_SIZE; - OBD_ALLOC(msg, sz); - if (!msg) - GOTO(out, rc = -ENOMEM); - - hsm_policy_bit2str(0, false, msg, sz); CWARN("%s: '%s' is unknown, " - "supported policies are: %s\n", mdt_obd_name(mdt), - token, msg); - OBD_FREE(msg, sz); + "supported policies are:\n", mdt_obd_name(mdt), + token); + hsm_policy_bit2str(m, 0, false); GOTO(out, rc = -EINVAL); } switch (sign) { @@ -1933,25 +1918,25 @@ out: OBD_FREE(buf, count + 1); RETURN(rc); } +LPROC_SEQ_FOPS(mdt_hsm_policy); #define GENERATE_PROC_METHOD(VAR) \ -static int lprocfs_rd_hsm_##VAR(char *page, char **start, off_t off, \ - int count, int *eof, void *data) \ +static int mdt_hsm_##VAR##_seq_show(struct seq_file *m, void *data) \ { \ - struct mdt_device *mdt = data; \ + struct mdt_device *mdt = m->private; \ struct coordinator *cdt = &mdt->mdt_coordinator; \ - int sz; \ ENTRY; \ \ - sz = snprintf(page, count, LPU64"\n", (__u64)cdt->VAR); \ - *eof = 1; \ - RETURN(sz); \ + seq_printf(m, LPU64"\n", (__u64)cdt->VAR); \ + RETURN(0); \ } \ -static int lprocfs_wr_hsm_##VAR(struct file *file, const char *buffer, \ - unsigned long count, void *data) \ +static ssize_t \ +mdt_hsm_##VAR##_seq_write(struct file *file, const char __user *buffer, \ + size_t count, loff_t *off) \ \ { \ - struct mdt_device *mdt = data; \ + struct seq_file *m = file->private_data; \ + struct mdt_device *mdt = m->private; \ struct coordinator *cdt = &mdt->mdt_coordinator; \ int val; \ int rc; \ @@ -1965,7 +1950,7 @@ static int lprocfs_wr_hsm_##VAR(struct file *file, const char *buffer, \ RETURN(count); \ } \ RETURN(-EINVAL); \ -} +} \ GENERATE_PROC_METHOD(cdt_loop_period) GENERATE_PROC_METHOD(cdt_grace_delay) @@ -1984,10 +1969,12 @@ GENERATE_PROC_METHOD(cdt_default_archive_id) #define CDT_HELP_CMD "help" #define CDT_MAX_CMD_LEN 10 -int lprocfs_wr_hsm_cdt_control(struct file *file, const char __user *buffer, - unsigned long count, void *data) +ssize_t +mdt_hsm_cdt_control_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; + struct seq_file *m = file->private_data; + struct obd_device *obd = m->private; struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev); struct coordinator *cdt = &(mdt->mdt_coordinator); int rc, usage = 0; @@ -2051,83 +2038,71 @@ int lprocfs_wr_hsm_cdt_control(struct file *file, const char __user *buffer, RETURN(count); } -int lprocfs_rd_hsm_cdt_control(char *page, char **start, off_t off, - int count, int *eof, void *data) +int mdt_hsm_cdt_control_seq_show(struct seq_file *m, void *data) { - struct obd_device *obd = data; + struct obd_device *obd = m->private; struct coordinator *cdt; - int sz; ENTRY; cdt = &(mdt_dev(obd->obd_lu_dev)->mdt_coordinator); - *eof = 1; if (cdt->cdt_state == CDT_INIT) - sz = snprintf(page, count, "init\n"); + seq_printf(m, "init\n"); else if (cdt->cdt_state == CDT_RUNNING) - sz = snprintf(page, count, "enabled\n"); + seq_printf(m, "enabled\n"); else if (cdt->cdt_state == CDT_STOPPING) - sz = snprintf(page, count, "stopping\n"); + seq_printf(m, "stopping\n"); else if (cdt->cdt_state == CDT_STOPPED) - sz = snprintf(page, count, "stopped\n"); + seq_printf(m, "stopped\n"); else if (cdt->cdt_state == CDT_DISABLE) - sz = snprintf(page, count, "disabled\n"); + seq_printf(m, "disabled\n"); else - sz = snprintf(page, count, "unknown\n"); + seq_printf(m, "unknown\n"); - RETURN(sz); + RETURN(0); } static int -lprocfs_rd_hsm_request_mask(char *page, char **start, off_t off, - int count, int *eof, __u64 mask) +mdt_hsm_request_mask_show(struct seq_file *m, __u64 mask) { int i, rc = 0; ENTRY; for (i = 0; i < 8 * sizeof(mask); i++) { if (mask & (1UL << i)) - rc += snprintf(page + rc, count - rc, "%s%s", - rc == 0 ? "" : " ", - hsm_copytool_action2name(i)); + rc += seq_printf(m, "%s%s", rc == 0 ? "" : " ", + hsm_copytool_action2name(i)); } - - rc += snprintf(page + rc, count - rc, "\n"); + rc += seq_printf(m, "\n"); RETURN(rc); } static int -lprocfs_rd_hsm_user_request_mask(char *page, char **start, off_t off, - int count, int *eof, void *data) +mdt_hsm_user_request_mask_seq_show(struct seq_file *m, void *data) { - struct mdt_device *mdt = data; + struct mdt_device *mdt = m->private; struct coordinator *cdt = &mdt->mdt_coordinator; - return lprocfs_rd_hsm_request_mask(page, start, off, count, eof, - cdt->cdt_user_request_mask); + return mdt_hsm_request_mask_show(m, cdt->cdt_user_request_mask); } static int -lprocfs_rd_hsm_group_request_mask(char *page, char **start, off_t off, - int count, int *eof, void *data) +mdt_hsm_group_request_mask_seq_show(struct seq_file *m, void *data) { - struct mdt_device *mdt = data; + struct mdt_device *mdt = m->private; struct coordinator *cdt = &mdt->mdt_coordinator; - return lprocfs_rd_hsm_request_mask(page, start, off, count, eof, - cdt->cdt_group_request_mask); + return mdt_hsm_request_mask_show(m, cdt->cdt_group_request_mask); } static int -lprocfs_rd_hsm_other_request_mask(char *page, char **start, off_t off, - int count, int *eof, void *data) +mdt_hsm_other_request_mask_seq_show(struct seq_file *m, void *data) { - struct mdt_device *mdt = data; + struct mdt_device *mdt = m->private; struct coordinator *cdt = &mdt->mdt_coordinator; - return lprocfs_rd_hsm_request_mask(page, start, off, count, eof, - cdt->cdt_other_request_mask); + return mdt_hsm_request_mask_show(m, cdt->cdt_other_request_mask); } static inline enum hsm_copytool_action @@ -2147,9 +2122,9 @@ hsm_copytool_name2action(const char *name) return -1; } -static int -lprocfs_wr_hsm_request_mask(struct file *file, const char __user *user_buf, - unsigned long user_count, __u64 *mask) +static ssize_t +mdt_write_hsm_request_mask(struct file *file, const char __user *user_buf, + size_t user_count, __u64 *mask) { char *buf, *pos, *name; size_t buf_size; @@ -2193,69 +2168,76 @@ out: RETURN(rc); } -static int -lprocfs_wr_hsm_user_request_mask(struct file *file, const char __user *buf, - unsigned long count, void *data) +static ssize_t +mdt_hsm_user_request_mask_seq_write(struct file *file, const char __user *buf, + size_t count, loff_t *off) { - struct mdt_device *mdt = data; + struct seq_file *m = file->private_data; + struct mdt_device *mdt = m->private; struct coordinator *cdt = &mdt->mdt_coordinator; - return lprocfs_wr_hsm_request_mask(file, buf, count, + return mdt_write_hsm_request_mask(file, buf, count, &cdt->cdt_user_request_mask); } -static int -lprocfs_wr_hsm_group_request_mask(struct file *file, const char __user *buf, - unsigned long count, void *data) +static ssize_t +mdt_hsm_group_request_mask_seq_write(struct file *file, const char __user *buf, + size_t count, loff_t *off) { - struct mdt_device *mdt = data; - struct coordinator *cdt = &mdt->mdt_coordinator; + struct seq_file *m = file->private_data; + struct mdt_device *mdt = m->private; + struct coordinator *cdt = &mdt->mdt_coordinator; - return lprocfs_wr_hsm_request_mask(file, buf, count, + return mdt_write_hsm_request_mask(file, buf, count, &cdt->cdt_group_request_mask); } -static int -lprocfs_wr_hsm_other_request_mask(struct file *file, const char __user *buf, - unsigned long count, void *data) +static ssize_t +mdt_hsm_other_request_mask_seq_write(struct file *file, const char __user *buf, + size_t count, loff_t *off) { - struct mdt_device *mdt = data; - struct coordinator *cdt = &mdt->mdt_coordinator; + struct seq_file *m = file->private_data; + struct mdt_device *mdt = m->private; + struct coordinator *cdt = &mdt->mdt_coordinator; - return lprocfs_wr_hsm_request_mask(file, buf, count, + return mdt_write_hsm_request_mask(file, buf, count, &cdt->cdt_other_request_mask); } +LPROC_SEQ_FOPS(mdt_hsm_cdt_loop_period); +LPROC_SEQ_FOPS(mdt_hsm_cdt_grace_delay); +LPROC_SEQ_FOPS(mdt_hsm_cdt_active_req_timeout); +LPROC_SEQ_FOPS(mdt_hsm_cdt_max_requests); +LPROC_SEQ_FOPS(mdt_hsm_cdt_default_archive_id); +LPROC_SEQ_FOPS(mdt_hsm_user_request_mask); +LPROC_SEQ_FOPS(mdt_hsm_group_request_mask); +LPROC_SEQ_FOPS(mdt_hsm_other_request_mask); + static struct lprocfs_vars lprocfs_mdt_hsm_vars[] = { - { "agents", NULL, NULL, NULL, &mdt_hsm_agent_fops, - 0 }, - { "actions", NULL, NULL, NULL, &mdt_hsm_actions_fops, - 0444 }, - { "default_archive_id", lprocfs_rd_hsm_cdt_default_archive_id, - lprocfs_wr_hsm_cdt_default_archive_id, - NULL, NULL, 0 }, - { "grace_delay", lprocfs_rd_hsm_cdt_grace_delay, - lprocfs_wr_hsm_cdt_grace_delay, - NULL, NULL, 0 }, - { "loop_period", lprocfs_rd_hsm_cdt_loop_period, - lprocfs_wr_hsm_cdt_loop_period, - NULL, NULL, 0 }, - { "max_requests", lprocfs_rd_hsm_cdt_max_requests, - lprocfs_wr_hsm_cdt_max_requests, - NULL, NULL, 0 }, - { "policy", lprocfs_rd_hsm_policy, - lprocfs_wr_hsm_policy, - NULL, NULL, 0 }, - { "active_request_timeout", lprocfs_rd_hsm_cdt_active_req_timeout, - lprocfs_wr_hsm_cdt_active_req_timeout, - NULL, NULL, 0 }, - { "active_requests", NULL, NULL, NULL, - &mdt_hsm_active_requests_fops, 0 }, - { "user_request_mask", lprocfs_rd_hsm_user_request_mask, - lprocfs_wr_hsm_user_request_mask, }, - { "group_request_mask", lprocfs_rd_hsm_group_request_mask, - lprocfs_wr_hsm_group_request_mask, }, - { "other_request_mask", lprocfs_rd_hsm_other_request_mask, - lprocfs_wr_hsm_other_request_mask, }, + { .name = "agents", + .fops = &mdt_hsm_agent_fops }, + { .name = "actions", + .fops = &mdt_hsm_actions_fops, + .proc_mode = 0444 }, + { .name = "default_archive_id", + .fops = &mdt_hsm_cdt_default_archive_id_fops }, + { .name = "grace_delay", + .fops = &mdt_hsm_cdt_grace_delay_fops }, + { .name = "loop_period", + .fops = &mdt_hsm_cdt_loop_period_fops }, + { .name = "max_requests", + .fops = &mdt_hsm_cdt_max_requests_fops }, + { .name = "policy", + .fops = &mdt_hsm_policy_fops }, + { .name = "active_request_timeout", + .fops = &mdt_hsm_cdt_active_req_timeout_fops }, + { .name = "active_requests", + .fops = &mdt_hsm_active_requests_fops }, + { .name = "user_request_mask", + .fops = &mdt_hsm_user_request_mask_fops, }, + { .name = "group_request_mask", + .fops = &mdt_hsm_group_request_mask_fops, }, + { .name = "other_request_mask", + .fops = &mdt_hsm_other_request_mask_fops, }, { 0 } };