Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let Synda continue after an error trying to renew a certificate #145

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sdt/bin/sdcfbuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,12 @@ def create_configuration_file_sample(path):
config.add_section('download')
config.set('download', 'max_parallel_download', '8')
config.set('download', 'max_parallel_download_per_datanode', '8')
config.set('download', 'get_only_latest_version', 'true')
config.set('download', 'hpss', '1')
config.set('download', 'http_fallback', 'false')
config.set('download', 'gridftp_opt', '')
config.set('download', 'incremental_mode_for_datasets', 'false')
config.set('download', 'continue_on_cert_errors', 'false')

config.add_section('post_processing')
config.set('post_processing', 'host', 'localhost')
Expand Down
5 changes: 4 additions & 1 deletion sdt/bin/sdcfloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def load(configuration_file,credential_file):
# (pb with options below is that they are available in all sections)
default_options={'max_parallel_download':'8',
'max_parallel_download_per_datanode':'8',
'get_only_latest_version':'true',
'user':'',
'group':'',
'hpss':'0',
Expand Down Expand Up @@ -64,7 +65,9 @@ def load(configuration_file,credential_file):
'nearest_mode':'geolocation',
'openid':'https://esgf-node.ipsl.fr/esgf-idp/openid/foo',
'password':'foobar',
'incorrect_checksum_action':'remove'}
'incorrect_checksum_action':'remove',
'incremental_mode_for_datasets':'false',
'continue_on_cert_errors':'false'}

if __name__ == '__main__':
parser = argparse.ArgumentParser()
Expand Down
5 changes: 4 additions & 1 deletion sdt/bin/sddmdefault.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,10 @@ def transfers_begin(transfers):
sdlogon.renew_certificate(sdconfig.openid,sdconfig.password,force_renew_certificate=False)
except Exception,e:
sdlog.error("SDDMDEFA-502","Exception occured while retrieving certificate (%s)"%str(e))
raise
if sdconfig.config.get_boolean('download','continue_on_cert_errors'):
pass # Try to keep on going, probably a certificate isn't needed.
else:
raise

for tr in transfers:
start_transfer_thread(tr)
Expand Down
7 changes: 6 additions & 1 deletion sdt/bin/sdtaskscheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,12 @@ def event_loop():

except SDException,e:
sdlog.error("SDTSCHED-920","Error occured while retrieving ESGF certificate",stderr=True)
raise
sdlog.error("SDTSCHED-921","Exception=%s"%str(e))
if sdconfig.config.get_boolean('download','continue_on_cert_errors'):
sdlog.error("SDTSCHED-922"," will continue anyway")
pass #jfp try to keep on going; for most data nodes we don't need an OpenID.
else:
raise

sdlog.info("SDTSCHED-902","Transfer daemon is now up and running",stderr=True)

Expand Down