[sheepdog] [PATCH stable-0.8 5/6] sheep: reload config after successful migration

Hitoshi Mitake mitake.hitoshi at lab.ntt.co.jp
Thu Mar 20 09:52:24 CET 2014


From: Hitoshi Mitake <mitake.hitoshi at gmail.com>

Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
 sheep/config.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sheep/config.c b/sheep/config.c
index 22c6cfe..f82597b 100644
--- a/sheep/config.c
+++ b/sheep/config.c
@@ -107,8 +107,10 @@ int init_config_file(void)
 					sd_err("failed to reload config file,"
 					       " %m");
 					ret = -1;
-				} else
+				} else {
 					ret = 0;
+					goto reload;
+				}
 			}
 			goto out;
 		}
@@ -117,6 +119,8 @@ int init_config_file(void)
 		ret = -1;
 		goto out;
 	}
+
+reload:
 	ret = 0;
 	get_cluster_config(&sys->cinfo);
 out:
-- 
1.8.1.2




More information about the sheepdog mailing list