Chksum fixes maint 5.6 #3038
Chksum fixes maint 5.6 #3038
Conversation
|
@jedwards4b , I'd like to have this fix in CIME master before I merge back to E3SM. Will you be doing a maint merge any time soon? |
|
Yes we can do it as soon as this is merged. |
There was a problem hiding this comment.
One minor inline comment.
More generally, though: I can see how this addresses point (2) from #3034, but I don't see how this addresses point (1) from that issue. Can you please point me to the changes that address that first point?
| @@ -137,7 +137,8 @@ def check_all_input_data(self, protocol=None, address=None, input_data_root=None | |||
| inputdata = Inputdata() | |||
| protocol = "svn" | |||
| success = False | |||
| while not success and protocol is not None: | |||
| # download and merge all available chksum files. | |||
| while protocol is not None: | |||
There was a problem hiding this comment.
Since you no longer use the success value returned from the call to _download_checksum_file, you should probably change that to _ to signal that the return value isn't used.
There was a problem hiding this comment.
Thanks. I'll wait to approve until you answer my more general question.
|
@billsacks - fixed now. |
There was a problem hiding this comment.
Thanks a lot, @jedwards4b . This mostly looks good to me now.
One small remaining thing: The meaning of the status return value from _download_checksum_file is not very clear, now that it loops over servers. Does True indicate that all downloads were successful, or that at least one was, or that the last one was? Can you please either clarify this in the documentation of the function or remove this return (since it doesn't seem to actually be checked anywhere now).
|
@billsacks you are correct, I did miss a case. Fixed now |
Fix chksum issues - only download chksum file(s) if requested, look on all servers in config_inputdata.xml for chksum files and merge those found.
Test suite: scripts_regression_tests.py
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes #3033
Fixes #3034
Fixes #3036
User interface changes?:
Update gh-pages html (Y/N)?:
Code review: