[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-71-gdbad787

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  dbad7873926a75adbff0fd0140ae321412f70d66 (commit)
      from  22c4940aed5d4fedd24e4f7613f0929275ba5824 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/dbad7873926a75adbff0fd0140ae321412f70d66

commit dbad7873926a75adbff0fd0140ae321412f70d66
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Mon Mar 24 16:49:18 2014 -0500

    fix fs detection when multiple fs exist
    
    ROMIO code assumes all processes will use the same ROMIO driver.  we
    were not reaching the "find a common file system" logic when NFS was
    enabled, everyone stat-ed the file system without errors, but some
    processees found a different file system (like if some processes are
    writing to NFS and others to UFS)
    
    See discussion beginning here:
    http://lists.mpich.org/pipermail/discuss/2014-March/002403.html
    
    Tested-by: Jeff Squyres <jsquyres at cisco.com>

diff --git a/src/mpi/romio/adio/common/ad_fstype.c b/src/mpi/romio/adio/common/ad_fstype.c
index ca97129..365ce48 100644
--- a/src/mpi/romio/adio/common/ad_fstype.c
+++ b/src/mpi/romio/adio/common/ad_fstype.c
@@ -686,32 +686,28 @@ void ADIO_ResolveFileType(MPI_Comm comm, const char *filename, int *fstype,
 	    }
 	} else {
 	    ADIO_FileSysType_fncall(filename, &file_system, &myerrcode);
-	    if (myerrcode != MPI_SUCCESS) {
-		*error_code = myerrcode;
 
-		/* the check for file system type will hang if any process got
-		 * an error in ADIO_FileSysType_fncall.  Processes encountering
-		 * an error will return early, before the collective file
-		 * system type check below.  This case could happen if a full
-		 * path exists on one node but not on others, and no prefix
-		 * like ufs: was provided.  see discussion at
-		 * http://www.mcs.anl.gov/web-mail-archive/lists/mpich-discuss/2007/08/msg00042.html
-		 * (edit: now
-		 * http://lists.mcs.anl.gov/pipermail/mpich-discuss/2007-August/002648.html)
-	         */
-
-	        MPI_Allreduce(error_code, &max_code, 1, MPI_INT, MPI_MAX, comm);
-		if (max_code != MPI_SUCCESS)  {
-		    *error_code = max_code;
-		    return;
-		} 
-		/* ensure everyone came up with the same file system type */
-		MPI_Allreduce(&file_system, &min_code, 1, MPI_INT, 
-			MPI_MIN, comm);
-		if (min_code == ADIO_NFS) file_system = ADIO_NFS;
+	    /* the check for file system type will hang if any process got
+	     * an error in ADIO_FileSysType_fncall.  Processes encountering
+	     * an error will return early, before the collective file
+	     * system type check below.  This case could happen if a full
+	     * path exists on one node but not on others, and no prefix
+	     * like ufs: was provided.  see discussion at
+	     * http://www.mcs.anl.gov/web-mail-archive/lists/mpich-discuss/2007/08/msg00042.html
+	     * (edit: now
+	     * http://lists.mcs.anl.gov/pipermail/mpich-discuss/2007-August/002648.html)
+	     */
+
+	    MPI_Allreduce(&myerrcode, &max_code, 1, MPI_INT, MPI_MAX, comm);
+	    if (max_code != MPI_SUCCESS)  {
+		*error_code = max_code;
+		return;
 	    }
+	    /* ensure everyone came up with the same file system type */
+	    MPI_Allreduce(&file_system, &min_code, 1, MPI_INT,
+		    MPI_MIN, comm);
+	    if (min_code == ADIO_NFS) file_system = ADIO_NFS;
 	}
-
     }
     else {
 	/* prefix specified; just match via prefix and assume everyone got 

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/romio/adio/common/ad_fstype.c |   42 +++++++++++++++------------------
 1 files changed, 19 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
MPICH primary repository