liblustre: support zeroconf.

but current existed tests still use dumpfile, switch to zconf later.

diff --git a/lustre/liblustre/recovery_small.c b/lustre/liblustre/recovery_small.c
index 67fd1f7..700faa8 100644 (file)
--- a/lustre/liblustre/recovery_small.c
+++ b/lustre/liblustre/recovery_small.c
@@ -309,10 +309,12 @@ int main(int argc, char * argv[])
         int c;
         char cmd[1024];
 
+        setenv("LIBLUSTRE_USE_ZCONF", "no", 1);
+
         while ((c = getopt(argc, argv, "c:s:")) != -1) {
                 switch (c) {
                 case 'c':
-                        setenv("LUSTRE_CONFIG_FILE", optarg, 1);
+                        setenv("LIBLUSTRE_CONFIG_FILE", optarg, 1);
                         break;
                 case 's':
                         strcpy(mds_server, optarg);

diff --git a/lustre/liblustre/replay_single.c b/lustre/liblustre/replay_single.c
index 645654b..f2301c3 100755 (executable)
--- a/lustre/liblustre/replay_single.c
+++ b/lustre/liblustre/replay_single.c
@@ -191,6 +191,8 @@ int main(int argc, char * const argv[])
 {
         int c;
 
+        setenv("LIBLUSTRE_USE_ZCONF", "no", 1);
+
         while ((c = getopt(argc, argv, "s:b:f:c:")) != -1) {
                 switch (c) {
                 case 's':
@@ -203,7 +205,7 @@ int main(int argc, char * const argv[])
                         strcpy(failover_script, optarg);
                         break;
                 case 'c':
-                        setenv("LUSTRE_CONFIG_FILE", optarg, 1);
+                        setenv("LIBLUSTRE_CONFIG_FILE", optarg, 1);
                         break;
                 default:
                         usage(argv[0]);

diff --git a/lustre/utils/lrun b/lustre/utils/lrun
index 00865f1..3f96820 100755 (executable)
--- a/lustre/utils/lrun
+++ b/lustre/utils/lrun
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 LUSTRE_MOUNT_POINT=${LUSTRE_MOUNT_POINT:-"/mnt/lustre"}
+LIBLUSTRE_USE_ZCONF="no"
 LUSTRE_CONFIG_FILE=${LUSTRE_CONFIG_FILE:-"/tmp/DUMP_FILE"}
 LD_PRELOAD=${LD_PRELOAD:-"/usr/lib/liblustre.so"}