grow: don't wait forever for critical section to pass.

If an array reshape completed within 1 second, then --grow will not
notice that it has finished and will keep waiting for the critical
section to pass.

So be more cautious in the test.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/Grow.c b/Grow.c
index 14e48f5696cb0c93fb35eb843a4a5fbd99e40b3e..fc809c63a68d03d8121a97d9a601fc88ca2cf22d 100644 (file)
--- a/Grow.c
+++ b/Grow.c
@@ -815,6 +815,14 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
                        }
                        if (comp >= nstripe)
                                break;
+                       if (comp == 0) {
+                               /* Maybe it finished already */
+                               char action[20];
+                               if (sysfs_get_str(sra, NULL, "sync_action",
+                                                 action, 20) > 0 &&
+                                   strncmp(action, "reshape", 7) != 0)
+                                       break;
+                       }
                        sleep(1);
                }
 

diff --git a/mdadm.h b/mdadm.h
index f580e3e807388ead74966e25ffc20f0ff8577252..6770d6c866589b3489cb163bf203fea4c16e48f7 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -369,6 +369,8 @@ extern int sysfs_set_num(struct mdinfo *sra, struct mdinfo *dev,
 extern int sysfs_uevent(struct mdinfo *sra, char *event);
 extern int sysfs_get_ll(struct mdinfo *sra, struct mdinfo *dev,
                        char *name, unsigned long long *val);
+extern int sysfs_get_str(struct mdinfo *sra, struct mdinfo *dev,
+                        char *name, char *val, int size);
 extern int sysfs_set_safemode(struct mdinfo *sra, unsigned long ms);
 extern int sysfs_set_array(struct mdinfo *info, int vers);
 extern int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd);

diff --git a/sysfs.c b/sysfs.c
index 2dad7d3fd8c9969aefc636ce46213576aa4e85b1..d4a1e495d5256a0abeef19d1256bb83d069dd922 100644 (file)
--- a/sysfs.c
+++ b/sysfs.c
@@ -466,6 +466,25 @@ int sysfs_get_ll(struct mdinfo *sra, struct mdinfo *dev,
        return 0;
 }
 
+int sysfs_get_str(struct mdinfo *sra, struct mdinfo *dev,
+                      char *name, char *val, int size)
+{
+       char fname[50];
+       int n;
+       int fd;
+       sprintf(fname, "/sys/block/%s/md/%s/%s",
+               sra->sys_name, dev?dev->sys_name:"", name);
+       fd = open(fname, O_RDONLY);
+       if (fd < 0)
+               return -1;
+       n = read(fd, val, size);
+       close(fd);
+       if (n <= 0)
+               return -1;
+       val[n] = 0;
+       return n;
+}
+
 int sysfs_set_safemode(struct mdinfo *sra, unsigned long ms)
 {
        unsigned long sec;