Skip to content

Commit 49ff97e

Browse files
committed
Reducing cpu_io_boud rate and fixing region_name.
1 parent 0306484 commit 49ff97e

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

awswrangler/session.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Session:
2626
AWS Glue Connections attributes, number of cpu cores that can be used, etc)
2727
"""
2828

29-
PROCS_IO_BOUND_FACTOR = 4
29+
PROCS_IO_BOUND_FACTOR = 2
3030

3131
def __init__(
3232
self,
@@ -35,7 +35,7 @@ def __init__(
3535
aws_access_key_id=None,
3636
aws_secret_access_key=None,
3737
aws_session_token=None,
38-
region_name="us-east-1",
38+
region_name=None,
3939
botocore_max_retries=40,
4040
spark_context=None,
4141
spark_session=None,
@@ -52,7 +52,7 @@ def __init__(
5252
:param aws_access_key_id: Boto3 aws_access_key_id
5353
:param aws_secret_access_key: Boto3 aws_secret_access_key
5454
:param aws_session_token: Boto3 aws_session_token
55-
:param region_name: Boto3 region_name (Default: us-east-1)
55+
:param region_name: Boto3 region_name
5656
:param botocore_max_retries: Botocore max retries
5757
:param spark_context: Spark Context (pyspark.SparkContext)
5858
:param spark_session: Spark Session (pyspark.sql.SparkSession)
@@ -95,17 +95,17 @@ def _load_new_boto3_session(self):
9595
Load or reload a new Boto3 Session for the AWS Wrangler Session
9696
:return: None
9797
"""
98+
args = {}
9899
if self.profile_name:
99-
self._boto3_session = boto3.Session(region_name=self.region_name,
100-
profile_name=self.profile_name)
101-
elif self.aws_access_key_id and self.aws_secret_access_key:
102-
self._boto3_session = boto3.Session(
103-
region_name=self.region_name,
104-
aws_access_key_id=self.aws_access_key_id,
105-
aws_secret_access_key=self.aws_secret_access_key,
106-
)
107-
else:
108-
self._boto3_session = boto3.Session(region_name=self.region_name)
100+
args["profile_name"] = self.profile_name
101+
if self.region_name:
102+
args["region_name"] = self.region_name
103+
if self.aws_access_key_id and self.aws_secret_access_key:
104+
args["aws_access_key_id"] = self.aws_access_key_id
105+
args["aws_secret_access_key"] = self.aws_secret_access_key
106+
107+
self._boto3_session = boto3.Session(**args)
108+
109109
self._profile_name = self._boto3_session.profile_name
110110
self._aws_access_key_id = self._boto3_session.get_credentials(
111111
).access_key

0 commit comments

Comments
 (0)