Skip to content

Commit a05298f

Browse files
committed
fix: cumulus deletion is causing ES deletes to persist
1 parent decf638 commit a05298f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

cumulus_lambda_functions/uds_api/granules_api.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import json
22
import os
3+
from time import sleep
34
from typing import Union
45

56
from starlette.responses import Response, JSONResponse
@@ -264,8 +265,9 @@ async def delete_single_granule_dapa_actual(request: Request, collection_id: str
264265
cumulus_lambda_prefix = os.getenv('CUMULUS_LAMBDA_PREFIX')
265266
cumulus = GranulesQuery('https://na/dev', 'NA')
266267
cumulus.with_collection_id(collection_id)
267-
# cumulus_delete_result = cumulus.delete_entry(cumulus_lambda_prefix, granule_id) # TODO not sure it is correct granule ID
268-
# LOGGER.debug(f'cumulus_delete_result: {cumulus_delete_result}')
268+
cumulus_delete_result = cumulus.delete_entry(cumulus_lambda_prefix, granule_id) # TODO not sure it is correct granule ID
269+
LOGGER.debug(f'cumulus_delete_result: {cumulus_delete_result}')
270+
sleep(3) # Testing if this helps
269271
es_delete_result = GranulesDbIndex().delete_entry(collection_identifier.tenant,
270272
collection_identifier.venue,
271273
granule_id

tests/integration_tests/test_granules_deletion.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def setUp(self) -> None:
3333

3434
self.tenant = 'UDS_LOCAL_TEST_3' # 'uds_local_test' # 'uds_sandbox'
3535
self.tenant_venue = 'DEV' # 'DEV1' # 'dev'
36-
self.collection_name = 'AAA-03' # 'uds_collection' # 'sbx_collection'
36+
self.collection_name = 'DDD-01' # 'uds_collection' # 'sbx_collection'
3737
# self.collection_version = '08'.replace('.', '') # '2402011200'
3838
return
3939

@@ -83,7 +83,7 @@ def test_delete_all(self):
8383
self.assertEqual(query_result.status_code, 200, f'wrong status code. {query_result.text}')
8484
response_json = json.loads(query_result.text)
8585
print(json.dumps(response_json, indent=4))
86-
sleep(30)
86+
sleep(10)
8787
post_url = f'{self.uds_url}collections/{collection_id}/items/' # MCP Dev
8888
query_result = requests.get(url=post_url, headers=headers,)
8989
self.assertEqual(query_result.status_code, 200, f'wrong status code. {query_result.text}')

0 commit comments

Comments
 (0)