Skip to content

Commit 9fa9787

Browse files
[ASYNC] apply #2258 to async code
1 parent 3b2b76b commit 9fa9787

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

src/snowflake/connector/aio/_file_transfer_agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def transfer_done_cb(
195195
) -> None:
196196
# Note: chunk_id is 0 based while num_of_chunks is count
197197
logger.debug(
198-
f"Chunk {chunk_id}/{done_client.num_of_chunks} of file {done_client.meta.name} reached callback"
198+
f"Chunk(id: {chunk_id}) {chunk_id+1}/{done_client.num_of_chunks} of file {done_client.meta.name} reached callback"
199199
)
200200
if task.exception():
201201
done_client.failed_transfers += 1

src/snowflake/connector/aio/_s3_storage_client.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ def generate_authenticated_url_and_args_v4() -> tuple[str, dict[str, bytes]]:
127127
amzdate = t.strftime("%Y%m%dT%H%M%SZ")
128128
short_amzdate = amzdate[:8]
129129
x_amz_headers["x-amz-date"] = amzdate
130+
x_amz_headers["x-amz-security-token"] = self.credentials.creds.get(
131+
"AWS_TOKEN", ""
132+
)
130133

131134
(
132135
canonical_request,

src/snowflake/connector/aio/_storage_client.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ async def _send_request_with_retry(
193193
conn = self.meta.sfagent._cursor._connection
194194

195195
while self.retry_count[retry_id] < self.max_retry:
196+
logger.debug(f"retry #{self.retry_count[retry_id]}")
196197
cur_timestamp = self.credentials.timestamp
197198
url, rest_kwargs = get_request_args()
198199
# rest_kwargs["timeout"] = (REQUEST_CONNECTION_TIMEOUT, REQUEST_READ_TIMEOUT)
@@ -208,10 +209,14 @@ async def _send_request_with_retry(
208209
)
209210

210211
if await self._has_expired_presigned_url(response):
212+
logger.debug(
213+
"presigned url expired. trying to update presigned url."
214+
)
211215
await self._update_presigned_url()
212216
else:
213217
self.last_err_is_presigned_url = False
214218
if response.status in self.TRANSIENT_HTTP_ERR:
219+
logger.debug(f"transient error: {response.status}")
215220
await asyncio.sleep(
216221
min(
217222
# TODO should SLEEP_UNIT come from the parent
@@ -222,7 +227,9 @@ async def _send_request_with_retry(
222227
)
223228
self.retry_count[retry_id] += 1
224229
elif await self._has_expired_token(response):
230+
logger.debug("token is expired. trying to update token")
225231
self.credentials.update(cur_timestamp)
232+
self.retry_count[retry_id] += 1
226233
else:
227234
return response
228235
except self.TRANSIENT_ERRORS as e:

0 commit comments

Comments
 (0)