LU-7988 hsm: run HSM coordinator once per second at most

[fs/lustre-release.git] / lustre / mdt / mdt_mds.c

diff --git a/lustre/mdt/mdt_mds.c b/lustre/mdt/mdt_mds.c
index 7c5560d..eee7e16 100644 (file)
--- a/lustre/mdt/mdt_mds.c
+++ b/lustre/mdt/mdt_mds.c
@@ -65,6 +65,7 @@ struct mds_device {
        struct ptlrpc_service   *mds_mdss_service;
        struct ptlrpc_service   *mds_fld_service;
        struct mutex             mds_health_mutex;
+       struct kset             *mds_kset;
 };
 
 /*
@@ -183,7 +184,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .so_hpreq_handler       = ptlrpc_hpreq_handler,
                },
        };
-       m->mds_regular_service = ptlrpc_register_service(&conf, procfs_entry);
+       m->mds_regular_service = ptlrpc_register_service(&conf, m->mds_kset,
+                                                        procfs_entry);
        if (IS_ERR(m->mds_regular_service)) {
                rc = PTR_ERR(m->mds_regular_service);
                CERROR("failed to start regular mdt service: %d\n", rc);
@@ -226,7 +228,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .so_req_printer         = target_print_req,
                },
        };
-       m->mds_readpage_service = ptlrpc_register_service(&conf, procfs_entry);
+       m->mds_readpage_service = ptlrpc_register_service(&conf, m->mds_kset,
+                                                         procfs_entry);
        if (IS_ERR(m->mds_readpage_service)) {
                rc = PTR_ERR(m->mds_readpage_service);
                CERROR("failed to start readpage service: %d\n", rc);
@@ -273,7 +276,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .so_hpreq_handler       = NULL,
                },
        };
-       m->mds_setattr_service = ptlrpc_register_service(&conf, procfs_entry);
+       m->mds_setattr_service = ptlrpc_register_service(&conf, m->mds_kset,
+                                                        procfs_entry);
        if (IS_ERR(m->mds_setattr_service)) {
                rc = PTR_ERR(m->mds_setattr_service);
                CERROR("failed to start setattr service: %d\n", rc);
@@ -318,7 +322,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .so_hpreq_handler       = NULL,
                },
        };
-       m->mds_out_service = ptlrpc_register_service(&conf, procfs_entry);
+       m->mds_out_service = ptlrpc_register_service(&conf, m->mds_kset,
+                                                    procfs_entry);
        if (IS_ERR(m->mds_out_service)) {
                rc = PTR_ERR(m->mds_out_service);
                CERROR("failed to start out service: %d\n", rc);
@@ -353,7 +358,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .so_hpreq_handler       = NULL,
                },
        };
-       m->mds_mdsc_service = ptlrpc_register_service(&conf, procfs_entry);
+       m->mds_mdsc_service = ptlrpc_register_service(&conf, m->mds_kset,
+                                                     procfs_entry);
        if (IS_ERR(m->mds_mdsc_service)) {
                rc = PTR_ERR(m->mds_mdsc_service);
                CERROR("failed to start seq controller service: %d\n", rc);
@@ -389,7 +395,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .so_hpreq_handler       = NULL,
                },
        };
-       m->mds_mdss_service = ptlrpc_register_service(&conf, procfs_entry);
+       m->mds_mdss_service = ptlrpc_register_service(&conf, m->mds_kset,
+                                                     procfs_entry);
        if (IS_ERR(m->mds_mdss_service)) {
                rc = PTR_ERR(m->mds_mdss_service);
                CERROR("failed to start metadata seq server service: %d\n", rc);
@@ -423,7 +430,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
                        .so_hpreq_handler       = NULL,
                },
        };
-       m->mds_fld_service = ptlrpc_register_service(&conf, procfs_entry);
+       m->mds_fld_service = ptlrpc_register_service(&conf, m->mds_kset,
+                                                    procfs_entry);
        if (IS_ERR(m->mds_fld_service)) {
                rc = PTR_ERR(m->mds_fld_service);
                CERROR("failed to start fld service: %d\n", rc);
@@ -453,7 +461,7 @@ static struct lu_device *mds_device_fini(const struct lu_env *env,
        ENTRY;
 
        mds_stop_ptlrpc_service(m);
-       lprocfs_obd_cleanup(obd);
+       lprocfs_kset_unregister(obd, m->mds_kset);
        RETURN(NULL);
 }
 
@@ -468,18 +476,6 @@ static struct lu_device *mds_device_free(const struct lu_env *env,
        RETURN(NULL);
 }
 
-LPROC_SEQ_FOPS_RO_TYPE(mds, uuid);
-
-static struct lprocfs_vars lprocfs_mds_obd_vars[] = {
-       {
-               .name   = "uuid",
-               .fops   = &mds_uuid_fops
-       },
-       {
-               .name   = NULL
-       }
-};
-
 static struct lu_device *mds_device_alloc(const struct lu_env *env,
                                          struct lu_device_type *t,
                                          struct lustre_cfg *cfg)
@@ -503,8 +499,7 @@ static struct lu_device *mds_device_alloc(const struct lu_env *env,
        /* set this lu_device to obd, because error handling need it */
        obd->obd_lu_dev = l;
 
-       obd->obd_vars = lprocfs_mds_obd_vars;
-       rc = lprocfs_obd_setup(obd);
+       rc = lprocfs_kset_register(obd, &m->mds_kset);
        if (rc != 0) {
                mds_device_free(env, l);
                l = ERR_PTR(rc);
@@ -514,8 +509,8 @@ static struct lu_device *mds_device_alloc(const struct lu_env *env,
        mutex_init(&m->mds_health_mutex);
 
        rc = mds_start_ptlrpc_service(m);
-
        if (rc != 0) {
+               lprocfs_kset_unregister(obd, m->mds_kset);
                mds_device_free(env, l);
                l = ERR_PTR(rc);
                return l;