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.

Sign up for GitHub

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

EC2 Pipeline Services Fixes #478

Merged
merged 1 commit into from
Jun 20, 2023
Merged

EC2 Pipeline Services Fixes #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Source/Visualizations/aws_loosa/processes/base/aws_egis_process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def __init__(self, a_log_directory=None, a_log_level='INFO', a_name=''):
elif self.service_name.startswith("srf"):
self.configuration = "short_range"
elif self.service_name.startswith("mrf"):
self.configuration = "medium_range"
self.configuration = "medium_range_mem1"

self.server_name = service_data["egis_server"]
self.folder_name = service_data["egis_folder"]
Expand Down
6 changes: 3 additions & 3 deletions Source/Visualizations/aws_loosa/processing_pipeline/watch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ def move_to_available(self, resource):
for dataset, info in list(self._datasets_info.items()):
transfer_resource = dataset.get_single_transfer_path(resource, self.date)
if transfer_resource and self.watcher._has_connected_processes:
lock_file = f"{transfer_resource}_{dataset.name}.LOCK"
lock_file = f"{transfer_resource}_{''.join([x[0] for x in dataset.name.split('_')])}.LOCK"
if not os.path.exists(lock_file):
open(lock_file, 'w+').close()

Expand Down Expand Up @@ -642,7 +642,7 @@ def create_file_uri_lock(self, a_dataset):
if os.path.exists(uri):
# A {uri}_{a_dataset.name}.LOCK file will be created which indicates to other processes that the uri
# file is being used and cant be deleted.
lock_file = f"{uri}_{a_dataset.name}.LOCK"
lock_file = f"{uri}_{''.join([x[0] for x in a_dataset.name.split('_')])}.LOCK"
file_in_use = False
if not os.path.exists(lock_file):
open(lock_file, 'w+').close()
Expand Down Expand Up @@ -687,7 +687,7 @@ def delete_file_uri_lock(self, a_dataset):
transfer_paths = a_dataset.get_all_transfer_paths(dataset[self.URIS_KEY], self.date)

for uri in transfer_paths:
lock_file = f"{uri}_{a_dataset.name}.LOCK"
lock_file = f"{uri}_{''.join([x[0] for x in a_dataset.name.split('_')])}.LOCK"
# Only delete the lock file if it exists and a window is not set for the dataset. This will make sure that
# files are not deleted for a service that uses a window.
if os.path.exists(lock_file) and not a_dataset.window:
Expand Down