Merge pull request open-mpi#4656 from aravindksg/v2.x

hppritcha · web-flow · commit 0b0fedfab93c · 2018-01-03T16:04:45.000-07:00
MTL OFI: Allow retries in MTL progress for interrupted syscalls
diff --git a/ompi/mca/mtl/ofi/mtl_ofi.h b/ompi/mca/mtl/ofi/mtl_ofi.h
@@ -116,7 +116,7 @@ ompi_mtl_ofi_progress(void)
                 exit(1);
             }
         } else {
-            if (ret == -FI_EAGAIN) {
+            if (ret == -FI_EAGAIN || ret == -EINTR) {
                 break;
             } else {
                 opal_output(0, "%s:%d: Error returned from fi_cq_read: %s(%zd).\n"

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ ompi_mtl_ofi_progress(void)`
`116`	`116`	`exit(1);`
`117`	`117`	`}`
`118`	`118`	`} else {`
`119`		`- if (ret == -FI_EAGAIN) {`
	`119`	`+ if (ret == -FI_EAGAIN \|\| ret == -EINTR) {`
`120`	`120`	`break;`
`121`	`121`	`} else {`
`122`	`122`	`opal_output(0, "%s:%d: Error returned from fi_cq_read: %s(%zd).\n"`