init ls_nodeid and set initial sequence for MDS

call mkobj instead of mkdir if there is no name

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index b8a173b..096840b 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -215,11 +215,13 @@ static int mdt_connect(struct mdt_thread_info *info,
         result = target_handle_connect(req, mdt_handle);
         if (result == 0) {
                 struct obd_connect_data *data;
+                int range;
 
                 LASSERT(req->rq_export != NULL);
                 info->mti_mdt = mdt_dev(req->rq_export->exp_obd->obd_lu_dev);
 
                 data = lustre_msg_buf(req->rq_repmsg, 0, sizeof *data);
+
                 result = seq_mgr_alloc(info->mti_ctxt,
                                        info->mti_mdt->mdt_seq_mgr,
                                        &data->ocd_seq);
@@ -1350,6 +1352,7 @@ static int mdt_init0(struct mdt_device *m,
         char   ns_name[48];
         struct lu_context ctx;
         const char *dev = lustre_cfg_string(cfg, 0);
+        const char *num = lustre_cfg_string(cfg, 2);
         struct obd_device *obd;
         ENTRY;
 
@@ -1376,12 +1379,18 @@ static int mdt_init0(struct mdt_device *m,
                 GOTO(err_fini_site, rc);
         }
 
+        /* set server index */
+        LASSERT(num);
+        s->ls_node_id = simple_strtol(num, NULL, 10);
+        
         m->mdt_seq_mgr = seq_mgr_init(&seq_mgr_ops, m);
         if (!m->mdt_seq_mgr) {
                 CERROR("can't initialize sequence manager\n");
                 GOTO(err_fini_stack, rc);
         }
-
+        /* set initial sequence by mds index */
+        m->mdt_seq_mgr->m_seq = s->ls_node_id * LUSTRE_SEQ_RANGE;
+        
         rc = lu_context_init(&ctx);
         if (rc != 0)
                 GOTO(err_fini_mgr, rc);

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index aa18587..b5a852a 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -115,7 +115,7 @@ static int mdt_reint_create(struct mdt_thread_info *info)
                 break;
         }
         case S_IFDIR:{
-                if (info->mti_rr.rr_name)
+                if (strlen(info->mti_rr.rr_name) > 0)
                         rc = mdt_md_mkdir(info);
                 else
                         rc = mdt_md_mkobj(info);