[PATCH] Staging: lustre: fixed a blank line after declarations coding style issue
by Ronit Halder
Fixed a blank line after declarations coding style issue
Signed-off-by: Ronit Halder <ronit.crj(a)gmail.com>
---
drivers/staging/lustre/lustre/lov/lov_merge.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/lustre/lustre/lov/lov_merge.c b/drivers/staging/lustre/lustre/lov/lov_merge.c
index b7e7bfa..dd1cf3d 100644
--- a/drivers/staging/lustre/lustre/lov/lov_merge.c
+++ b/drivers/staging/lustre/lustre/lov/lov_merge.c
@@ -123,6 +123,7 @@ int lov_adjust_kms(struct obd_export *exp, struct lov_stripe_md *lsm,
if (shrink) {
for (; stripe < lsm->lsm_stripe_count; stripe++) {
struct lov_oinfo *loi = lsm->lsm_oinfo[stripe];
+
kms = lov_size_to_stripe(lsm, size, stripe);
CDEBUG(D_INODE,
"stripe %d KMS %sing %llu->%llu\n",
--
2.4.0.GIT
6 years, 10 months
[PATCH] Fix script/checkpatch.pl coding style issus.
by Incarnation P. Lee
---
drivers/staging/lustre/lustre/obdclass/cl_page.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index a7f3032..428c6b2 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -51,13 +51,13 @@
static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg,
int radix);
-# define PASSERT(env, page, expr) \
- do { \
- if (unlikely(!(expr))) { \
- CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n"); \
- LASSERT(0); \
- } \
- } while (0)
+# define PASSERT(env, page, expr) \
+ do { \
+ if (unlikely(!(expr))) { \
+ CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n"); \
+ LASSERT(0); \
+ } \
+ } while (0)
# define PINVRNT(env, page, exp) \
((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
@@ -169,6 +169,7 @@ int cl_page_gang_lookup(const struct lu_env *env, struct cl_object *obj,
while ((nr = radix_tree_gang_lookup(&hdr->coh_tree, (void **)pvec,
idx, CLT_PVEC_SIZE)) > 0) {
int end_of_region = 0;
+
idx = pvec[nr - 1]->cp_index + 1;
for (i = 0, j = 0; i < nr; ++i) {
page = pvec[i];
@@ -286,6 +287,7 @@ static struct cl_page *cl_page_alloc(const struct lu_env *env,
GFP_NOFS);
if (page != NULL) {
int result = 0;
+
atomic_set(&page->cp_ref, 1);
if (type == CPT_CACHEABLE) /* for radix tree */
atomic_inc(&page->cp_ref);
@@ -372,9 +374,8 @@ static struct cl_page *cl_page_find0(const struct lu_env *env,
idx) == page));
}
- if (page != NULL) {
+ if (page != NULL)
return page;
- }
/* allocate and initialize cl_page */
page = cl_page_alloc(env, o, idx, vmpage, type);
@@ -1425,7 +1426,7 @@ void cl_page_clip(const struct lu_env *env, struct cl_page *pg,
CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", from, to);
CL_PAGE_INVOID(env, pg, CL_PAGE_OP(cpo_clip),
(const struct lu_env *,
- const struct cl_page_slice *,int, int),
+ const struct cl_page_slice *, int, int),
from, to);
}
EXPORT_SYMBOL(cl_page_clip);
--
1.9.0
6 years, 10 months
[PATCH] staging:lustre: fix "space required after that ', '" error in cl_page.c
by anders.fridlund＠gmail.com
From: Anders Fridlund <anders.fridlund(a)gmail.com>
This is a patch to the cl_page.c file that fixes a
"space required after that ','" error found by the checkpatch.pl tool.
Signed-off-by: Anders Fridlund <anders.fridlund(a)gmail.com>
---
drivers/staging/lustre/lustre/obdclass/cl_page.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index a7f3032..282ae73 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -1425,7 +1425,7 @@ void cl_page_clip(const struct lu_env *env, struct cl_page *pg,
CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", from, to);
CL_PAGE_INVOID(env, pg, CL_PAGE_OP(cpo_clip),
(const struct lu_env *,
- const struct cl_page_slice *,int, int),
+ const struct cl_page_slice *, int, int),
from, to);
}
EXPORT_SYMBOL(cl_page_clip);
--
1.9.1
6 years, 10 months
[PATCH] Fix script/checkpatch.pl coding style issus.
by Incarnation P. Lee
---
drivers/staging/lustre/lustre/obdclass/cl_page.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index a7f3032..428c6b2 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -51,13 +51,13 @@
static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg,
int radix);
-# define PASSERT(env, page, expr) \
- do { \
- if (unlikely(!(expr))) { \
- CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n"); \
- LASSERT(0); \
- } \
- } while (0)
+# define PASSERT(env, page, expr) \
+ do { \
+ if (unlikely(!(expr))) { \
+ CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n"); \
+ LASSERT(0); \
+ } \
+ } while (0)
# define PINVRNT(env, page, exp) \
((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
@@ -169,6 +169,7 @@ int cl_page_gang_lookup(const struct lu_env *env, struct cl_object *obj,
while ((nr = radix_tree_gang_lookup(&hdr->coh_tree, (void **)pvec,
idx, CLT_PVEC_SIZE)) > 0) {
int end_of_region = 0;
+
idx = pvec[nr - 1]->cp_index + 1;
for (i = 0, j = 0; i < nr; ++i) {
page = pvec[i];
@@ -286,6 +287,7 @@ static struct cl_page *cl_page_alloc(const struct lu_env *env,
GFP_NOFS);
if (page != NULL) {
int result = 0;
+
atomic_set(&page->cp_ref, 1);
if (type == CPT_CACHEABLE) /* for radix tree */
atomic_inc(&page->cp_ref);
@@ -372,9 +374,8 @@ static struct cl_page *cl_page_find0(const struct lu_env *env,
idx) == page));
}
- if (page != NULL) {
+ if (page != NULL)
return page;
- }
/* allocate and initialize cl_page */
page = cl_page_alloc(env, o, idx, vmpage, type);
@@ -1425,7 +1426,7 @@ void cl_page_clip(const struct lu_env *env, struct cl_page *pg,
CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", from, to);
CL_PAGE_INVOID(env, pg, CL_PAGE_OP(cpo_clip),
(const struct lu_env *,
- const struct cl_page_slice *,int, int),
+ const struct cl_page_slice *, int, int),
from, to);
}
EXPORT_SYMBOL(cl_page_clip);
--
1.9.0
6 years, 10 months
Clean shutdown
by Kurt Strosahl
Hi,
I just did a clean shutdown/startup of two lustre file systems last weekend (also for electrical work). The order that I've found most effective is to first shutdown all the clients, then unmount the osts/shutdown the oss systems, then unmount the mdt/mgs and shut down that system. On the up I've found that turning on the mdt/mgs system, letting it mount up. Then mounting the osts (my oss systems don't mount lustre on boot). Once the last ost to be mounted looks like it has finished any recovery it needs to do I mount a single client and make sure it can see the entire system... and then go from there with the rest of the clients.
Since all the lustre clients I have are in the same room as the lustre file system itself I don't have to check for stray mounts (I just walk around the room looking for systems that are still on, and then power them off).
Good luck,
Kurt J. Strosahl
System Administrator
Scientific Computing Group, Thomas Jefferson National Accelerator Facility
Message: 1
Date: Fri, 03 Jul 2015 13:49:32 +0200
From: J?r?me BECOT <jerome.becot(a)inserm.fr>
To: HPDD-discuss(a)ml01.01.org
Subject: [HPDD-discuss] Clean shutdown
Message-ID: <559676CC.1060009(a)inserm.fr>
Content-Type: text/plain; charset=utf-8; format=flowed
Hi there,
We are running a small lustre system (1MGS/MDS + 2 OSTs). I haven't
found the information, so i ask you :
What is the good order to shutdown the whole system (for electrical
maintenance ...) when you run a combined MGT/MDT :
- disconnect the clients
- is there any way to check if there is a client still connected ?
- unmount the MGT/MDT
- unmount the OSTs
- ... poweroff all the servers
- mount the OSTs
- then the MGT/MDT
- then the clients ?
or should I stop the ost first and mount them last ?
Thanks
--
J?rome BECOT
Administrateur Syst?mes et R?seaux
Mol?cules ? vis?e Th?rapeutique par des approches in Silico (MTi)
Univ Paris Diderot, UMRS973 Inserm
Case 013
B?t. Lamarck A, porte 412
35, rue H?l?ne Brion 75205 Paris Cedex 13
France
Tel : 01 57 27 83 82
6 years, 10 months
[PATCH] staging: lustre: make ptlrpc_init static
by matt mooney
fix sparse warning in lustre/ptlrpc/ptlrpc_module.c:54:12:
warning: symbol 'ptlrpc_init' was not declared. Should it be static?
The __init macro is moved before the function name to match standard usage.
Signed-off-by: matt mooney <mfm(a)muteddisk.com>
---
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
index 5268887..ae99180 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
@@ -51,7 +51,7 @@ extern spinlock_t ptlrpc_rs_debug_lock;
extern struct mutex pinger_mutex;
extern struct mutex ptlrpcd_mutex;
-__init int ptlrpc_init(void)
+static int __init ptlrpc_init(void)
{
int rc, cleanup_phase = 0;
--
2.4.4
6 years, 10 months
OST migration and upgrade questions
by Jérôme BECOT
Hi,
I have 2 or 3 questions more to ask here :
- If I want move from 2 OSS A and B with 1 OST each (15+15TB) to 3 OSS
with 1 OST each (10+10+10TB) using the same servers (+1 new), what's the
best plan :
- Add the new 10TB OST C, then move data from OST B to OST A and C,
remove it, reformat with 10TB and readd it, then do the same with OST A ?
- Should I disable the OST B prior moving datas ?
- Should I run a specific command to exclude the OST or reformating
the block device with the same OST name/number is enough ?
- Something better ?
- We are happily running Lustre 2.6 and 2.6.92 clients. But we need to
upgrade our kernel version to fix a nasty bug making or nodes rebooting.
I plan to upgrade kernel and Lustre client to 2.7 with the available
RPMS. Is there any problem doing so ?
- Do you suggest to upgrade servers to 2.7 as well ? Can it be done from
2.6.0 to 2.7.0 by just upgrading the binaries or is there specific tasks
to run before ? Do we risk a data loss doing this ?
Many thanks
--
Jérome BECOT
Administrateur Systèmes et Réseaux
Molécules à visée Thérapeutique par des approches in Silico (MTi)
Univ Paris Diderot, UMRS973 Inserm
Case 013
Bât. Lamarck A, porte 412
35, rue Hélène Brion 75205 Paris Cedex 13
France
Tel : 01 57 27 83 82
6 years, 10 months
Mounting OSTs fails after format with error -110?
by Sean Caron
Hi all,
Me again :O Still working my way through server build on what's basically
Lustre-devel from Git.
I'm in Section 10 of the documentation trying to get the filesystem proper
built and it's not quite going according to plan.
Brief background: One MGS/MDT and three OSS machines. MGS/MDT at
192.168.1.100 and the three OSS machines are at 192.168.1.101,
192.168.1.102 and 192.168.1.103.
So I go and build the combined MGS and MGT datastore on my MGS using the
directions in Section 10.1 of the administration guide:
mkfs.lustre --fsname=lustre --mgs --mdt --index=0 --reformat /dev/md0
I then go and mount it up, no problem:
mkdir -p /mdt
mount -t lustre /dev/md0 /mdt
I see stuff in dmesg on the MGS/MDT machine and it looks good:
[ 296.734221] LDISKFS-fs (md0): mounted filesystem with ordered data mode.
Opts: user_xattr,errors=remount-ro
[ 304.545375] LDISKFS-fs (md0): mounted filesystem with ordered data mode.
Opts: user_xattr,errors=remount-ro
[ 304.729341] Lustre: Lustre: Build Version:
v2_7_55_0-g7cb2e4b-CHANGED-3.10.0-229.4.2.el7.centos_lustre.x86_64
[ 305.516113] LDISKFS-fs (md0): mounted filesystem with ordered data mode.
Opts: user_xattr,errors=remount-ro,no_mbcache
[ 305.964081] Lustre: ctl-lustre-MDT0000: No data found on store.
Initialize space
[ 305.992657] Lustre: lustre-MDT0000: new disk, initializing
[ 306.110046] Lustre: ctl-lustre-MDT0000: super-sequence allocation rc = 0
[0x0000000200000400-0x0000000240000400):0:mdt
So that all seems okay, but then I go over to my first OSS node ... I first
try to run mkfs.lustre, that seems to complete okay:
mkfs.lustre --fsname=lustre --mgsnode=192.168.1.100@tcp0 --ost --index=1
--reformat /dev/md2
But then if I try to actually mount that, it pauses for a moment, then
gives me a timeout error:
mkdir -p /ost1
mount -t lustre /dev/md2 /ost1
I see the following in dmesg ... Does an error -110 make any sense to
anyone?
[ 1010.230310] Lustre: Lustre: Build Version:
v2_7_55_0-g7cb2e4b-CHANGED-3.10.0-229.4.2.el7.centos_lustre.x86_64
[ 1011.468508] LDISKFS-fs (md2): mounted filesystem with ordered data mode.
Opts: errors=remount-ro,no_mbcache
[ 1016.665780] Lustre: 4595:0:(client.c:2003:ptlrpc_expire_one_request())
@@@ Request sent has timed out for slow reply: [sent 1435697020/real
1435697020] req@ffff881f958f8000 x1505437437394948/t0(0)
o250->MGC192.168.1.100@tcp@192.168.1.100@tcp:26/25 lens 520/544 e 0 to 1 dl
1435697025 ref 1 fl Rpc:XN/0/ffffffff rc 0/-1
[ 1022.955966] LustreError: 15f-b: lustre-OST0001: cannot register this
server with the MGS: rc = -110. Is the MGS running?
[ 1022.956230] LustreError:
4561:0:(obd_mount_server.c:1789:server_fill_super()) Unable to start
targets: -110
[ 1022.956388] LustreError:
4561:0:(obd_mount_server.c:1504:server_put_super()) no obd lustre-OST0001
[ 1022.956469] LustreError:
4561:0:(obd_mount_server.c:137:server_deregister_mount()) lustre-OST0001
not registered
[ 1023.216433] Lustre: server umount lustre-OST0001 complete
[ 1023.216439] LustreError: 4561:0:(obd_mount.c:1342:lustre_fill_super())
Unable to mount (-110)
I've ensured that LNET is running ... I was sure to disable SELinux ...
these are all running on an RFC1918 subnet; common broadcast domain; there
shouldn't be any firewalling or anything in the way ... connectivity
basically seems okay between the MGS/MDT and the OSS machines. Any thoughts?
Thanks!
Sean
6 years, 10 months
Clean shutdown
by Jérôme BECOT
Hi there,
We are running a small lustre system (1MGS/MDS + 2 OSTs). I haven't
found the information, so i ask you :
What is the good order to shutdown the whole system (for electrical
maintenance ...) when you run a combined MGT/MDT :
- disconnect the clients
- is there any way to check if there is a client still connected ?
- unmount the MGT/MDT
- unmount the OSTs
- ... poweroff all the servers
- mount the OSTs
- then the MGT/MDT
- then the clients ?
or should I stop the ost first and mount them last ?
Thanks
--
Jérome BECOT
Administrateur Systèmes et Réseaux
Molécules à visée Thérapeutique par des approches in Silico (MTi)
Univ Paris Diderot, UMRS973 Inserm
Case 013
Bât. Lamarck A, porte 412
35, rue Hélène Brion 75205 Paris Cedex 13
France
Tel : 01 57 27 83 82
6 years, 10 months
