remove test related to bugs 10800/13821 from always except list,

[fs/lustre-release.git] / lustre / tests / utime.c

diff --git a/lustre/tests/utime.c b/lustre/tests/utime.c
index c6a5d7d..8d8cd08 100644 (file)
--- a/lustre/tests/utime.c
+++ b/lustre/tests/utime.c
@@ -14,23 +14,44 @@
 
 void usage(char *prog)
 {
-       fprintf(stderr, "usage: %s <filename>\n", prog);
+       fprintf(stderr, "usage: %s <filename> [-s <filename>]\n", prog);
        exit(1);
 }
 
 int main(int argc, char *argv[])
 {
        long before_mknod, after_mknod;
-       long before_utime, after_utime;
        const char *prog = argv[0];
-       const char *filename = argv[1];
-       struct stat st;
+        const char *filename = argv[1];
+        char *secname = NULL;
+        struct utimbuf utb;
+       struct stat st, st2;
        int rc;
+        int c;
 
-       if (argc != 2)
+       utb.actime = 200000;
+       utb.modtime = 100000;
+
+        while ((c = getopt(argc, argv, "s:")) != -1) {
+                switch(c) {
+                case 's':
+                        secname = optarg;
+                        break;
+                default:
+                       usage(argv[0]);
+                }
+        }
+       if (optind + 1 > argc)
                usage(argv[0]);
 
-       before_mknod = time(0);
+       /* Adjust the before time back one second, because the kernel's
+        * CURRENT_TIME (lockless clock reading, used to set inode times)
+        * may drift against the do_gettimeofday() time (TSC-corrected and
+        * locked clock reading, used to return timestamps to user space).
+        * This means that the mknod time could be a second older than the
+        * before time, even for a local filesystem such as ext3.
+        */
+       before_mknod = time(0) - 1;
        rc = mknod(filename, 0700, S_IFREG);
        after_mknod = time(0);
        if (rc && errno != EEXIST) {
@@ -52,36 +73,89 @@ int main(int argc, char *argv[])
                        return 4;
                }
 
-               printf("%s: good mknod times %lu <= %lu <= %lu\n",
-                      prog, before_mknod, st.st_mtime, after_mknod);
+               printf("%s: good mknod times %lu%s <= %lu <= %lu for %s\n",
+                      prog, before_mknod, before_mknod == st.st_mtime ? "*":"",
+                      st.st_mtime, after_mknod, filename);
+
+                if (secname) {
+                        sleep(1);
+                        rc = stat(secname, &st2);
+                        if (rc) {
+                                fprintf(stderr, "%s: stat(%s) failed: rc %d: "
+                                        "%s\n", prog, secname, errno,
+                                        strerror(errno));
+                                return 5;
+                        }
 
-               sleep(5);
+                        if (st2.st_mtime < before_mknod || 
+                            st2.st_mtime > after_mknod) {
+                                fprintf(stderr, "%s: bad mknod times %lu <= %lu"
+                                        " <= %lu false\n", prog, before_mknod,
+                                        st2.st_mtime, after_mknod);
+                                return 6;
+                        }
+
+                        printf("%s: good mknod times %lu%s <= %lu <= %lu "
+                               "for %s\n", prog, before_mknod, 
+                               before_mknod == st.st_mtime ? "*":"", 
+                               st2.st_mtime, after_mknod, secname);
+                }
        }
 
-       before_utime = time(0);
-       rc = utime(filename, NULL);
-       after_utime = time(0);
+       /* See above */
+       rc = utime(filename, &utb);
        if (rc) {
                fprintf(stderr, "%s: utime(%s) failed: rc %d: %s\n",
                        prog, filename, errno, strerror(errno));
-               return 5;
+               return 7;
        }
-
+        
        rc = stat(filename, &st);
        if (rc) {
                fprintf(stderr, "%s: second stat(%s) failed: rc %d: %s\n",
                        prog, filename, errno, strerror(errno));
-               return 6;
+               return 8;
        }
 
-       if (st.st_mtime < before_utime || st.st_mtime > after_utime) {
-               fprintf(stderr, "%s: bad utime times %lu <= %lu <= %lu false\n",
-                       prog, before_utime, st.st_mtime, after_utime);
-               return 7;
+       if (st.st_mtime != utb.modtime ) {
+               fprintf(stderr, "%s: bad utime mtime %lu should be  %lu\n",
+                       prog, st.st_mtime, utb.modtime);
+               return 9;
+       }
+
+       if (st.st_atime != utb.actime ) {
+               fprintf(stderr, "%s: bad utime atime %lu should be  %lu\n",
+                       prog, st.st_atime, utb.actime);
+               return 10;
        }
 
-       printf("%s: good utime times %lu <= %lu <= %lu\n",
-              prog, before_utime, st.st_mtime, after_utime);
+       printf("%s: good utime mtimes %lu, atime %lu\n",
+              prog, utb.modtime, utb.actime);
+
+        if (secname == NULL)
+                return 0;
+        
+        /* Checking that times in past get updated on another client. */
+       rc = stat(secname, &st2);
+        if (rc) {
+               fprintf(stderr, "%s: second stat(%s) failed: rc %d: %s\n",
+                       prog, secname, errno, strerror(errno));
+               return 12;
+       }
 
+       if (st2.st_mtime != st.st_mtime) {
+               fprintf(stderr, "%s: not synced mtime between clients: %lu "
+                        "should be  %lu\n", prog, st2.st_mtime, st.st_mtime);
+               return 13;
+       }
+
+       if (st2.st_ctime != st.st_ctime) {
+               fprintf(stderr, "%s: not synced ctime between clients: %lu "
+                        " should be  %lu\n", prog, st2.st_ctime, st.st_ctime);
+               return 14;
+       }
+       
+        printf("%s: updated times for %s\n", prog, secname);
+        
        return 0;
 }