Handle certain empty subfiling environment variables #4038
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6185,8 +6185,13 @@ main(int argc, char **argv) | |
| { | ||
|
|
||
| #ifdef H5_HAVE_SUBFILING_VFD | ||
| int required = MPI_THREAD_MULTIPLE; | ||
| int provided = 0; | ||
| char *subfiling_subfile_prefix_saved; | ||
| char *subfiling_ioc_selection_criteria_saved; | ||
| char *subfiling_ioc_per_node_saved; | ||
| char *subfiling_stripe_size_saved; | ||
| char *subfiling_config_file_prefix_saved; | ||
| #endif | ||
| int mpi_size; | ||
| int mpi_rank = 0; | ||
|
|
@@ -6250,6 +6255,68 @@ main(int argc, char **argv) | |
|
|
||
| test_vector_io(mpi_rank, mpi_size); | ||
|
|
||
| #ifdef H5_HAVE_SUBFILING_VFD | ||
|
|
||
| if (mpi_rank == 0) | ||
| printf("\n --- TESTING SUBFILING VFD: environment variables set to empty --- \n"); | ||
|
|
||
| subfiling_subfile_prefix_saved = getenv("H5FD_SUBFILING_SUBFILE_PREFIX"); | ||
|
There was a problem hiding this comment. I believe that you need to strdup these There was a problem hiding this comment. True, although in this case we probably don't even need to try to save the values. @glennsong09 I think we can update this to just have the setenv/unsetenv pairs. There was a problem hiding this comment. Okay, I removed the value saving code. |
||
| subfiling_ioc_selection_criteria_saved = getenv("H5FD_SUBFILING_IOC_SELECTION_CRITERIA"); | ||
| subfiling_ioc_per_node_saved = getenv("H5FD_SUBFILING_IOC_PER_NODE"); | ||
| subfiling_stripe_size_saved = getenv("H5FD_SUBFILING_STRIPE_SIZE"); | ||
| subfiling_config_file_prefix_saved = getenv("H5FD_SUBFILING_CONFIG_FILE_PREFIX"); | ||
|
|
||
| HDsetenv("H5FD_SUBFILING_SUBFILE_PREFIX", "", 1); | ||
| HDsetenv("H5FD_SUBFILING_IOC_SELECTION_CRITERIA", "", 1); | ||
| HDsetenv("H5FD_SUBFILING_IOC_PER_NODE", "", 1); | ||
| HDsetenv("H5FD_SUBFILING_STRIPE_SIZE", "", 1); | ||
| HDsetenv("H5FD_SUBFILING_CONFIG_FILE_PREFIX", "", 1); | ||
|
|
||
| MPI_Barrier(comm); | ||
|
|
||
| if (mpi_rank == 0) | ||
| printf("\n --- TESTING MPIO VFD: selection I/O --- \n"); | ||
|
|
||
| test_selection_io(mpi_rank, mpi_size); | ||
|
|
||
| if (mpi_rank == 0) | ||
| printf("\n --- TESTING MPIO VFD: vector I/O --- \n"); | ||
|
|
||
| if (mpi_size < 2) { | ||
| if (mpi_rank == 0) { | ||
| printf(" Need at least 2 processes to run tests for vector I/O."); | ||
| SKIPPED(); | ||
| } | ||
| printf("\n"); | ||
| goto finish; | ||
| } | ||
|
|
||
| test_vector_io(mpi_rank, mpi_size); | ||
|
|
||
| HDunsetenv("H5FD_SUBFILING_SUBFILE_PREFIX"); | ||
| HDunsetenv("H5FD_SUBFILING_IOC_SELECTION_CRITERIA"); | ||
| HDunsetenv("H5FD_SUBFILING_IOC_PER_NODE"); | ||
| HDunsetenv("H5FD_SUBFILING_STRIPE_SIZE"); | ||
| HDunsetenv("H5FD_SUBFILING_CONFIG_FILE_PREFIX"); | ||
|
|
||
| if (subfiling_subfile_prefix_saved) { | ||
| HDsetenv("H5FD_SUBFILING_SUBFILE_PREFIX", subfiling_subfile_prefix_saved, 1); | ||
| } | ||
| if (subfiling_ioc_selection_criteria_saved) { | ||
| HDsetenv("H5FD_SUBFILING_IOC_SELECTION_CRITERIA", subfiling_ioc_selection_criteria_saved, 1); | ||
| } | ||
| if (subfiling_ioc_per_node_saved) { | ||
| HDsetenv("H5FD_SUBFILING_IOC_PER_NODE", subfiling_ioc_per_node_saved, 1); | ||
| } | ||
| if (subfiling_stripe_size_saved) { | ||
| HDsetenv("H5FD_SUBFILING_STRIPE_SIZE", subfiling_stripe_size_saved, 1); | ||
| } | ||
| if (subfiling_config_file_prefix_saved) { | ||
| HDsetenv("H5FD_SUBFILING_CONFIG_FILE_PREFIX", subfiling_config_file_prefix_saved, 1); | ||
| } | ||
|
|
||
| #endif | ||
|
|
||
| finish: | ||
| /* make sure all processes are finished before final report, cleanup | ||
| * and exit. | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same fix here? (Either not saving the values or strdup'ing them)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you think saving the values is necessary? I wasn't sure. If you don't think so, I can just remove it there too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the time being, we don't really need to save the values since this is the last set of tests that run. If another set of tests is interested in the values from the environment in the future we may need to save the values, but otherwise it's fine to remove them for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, I can remove it from this test too.