Skip to content
This repository has been archived by the owner on Apr 15, 2022. It is now read-only.

Commit

Permalink
Rc 2.7.0 001 (#127)
Browse files Browse the repository at this point in the history
* rc1

* ready for release
  • Loading branch information
Ben Epstein authored Apr 6, 2021
1 parent 98c8b7c commit 27ed0eb
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __init__(self, task_id: int):
self.jvm = self.spark_session._jvm
self.model: Optional[Model] = None

# Going to see some issue due to https://splicemachine.atlassian.net/browse/DBAAS-5247 :(
# Going to see some issue due to https://splicemachine.atlassian.net/browse/DB-11749 :(
# Exceptions that are thrown due to SQL will not be rolled back. Code-based exceptions will be
self.savepoint = self.Session.begin_nested() # Create a savepoint in case of errors

Expand Down Expand Up @@ -218,8 +218,10 @@ def _create_ddl(self):

def exception_handler(self, exc: Exception):
self.logger.info("Rolling back...",send_db=True)
self.logger.info(f"Savepoint is active... {self.savepoint.is_active}")
self.savepoint.rollback()
try: # SQL based exceptions will cause us to loose our savepoint https://splicemachine.atlassian.net/browse/DB-11749
self.savepoint.rollback()
except:
pass
self.Session.rollback()
self._cleanup() # always run cleanup, regardless of success or failure
raise exc
Expand All @@ -242,5 +244,4 @@ def execute(self) -> None:

for step_no, execute_step in enumerate(steps):
self.logger.info(f"Running Step {step_no}...")
self.logger.info(f"Savepoint is active... {self.savepoint.is_active}")
execute_step()
6 changes: 3 additions & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
FRAMEWORK_NAME: my-framework
MODE: development
ENVIRONMENT: ${ENVIRONMENT:-default}
image: splicemachine/sm_k8_mlflow:0.1.29
image: splicemachine/sm_k8_mlflow:0.1.30
ports:
- "5001:5001"
- "5003:5003"
Expand All @@ -46,7 +46,7 @@ services:
SAGEMAKER_ROLE: ${SAGEMAKER_ROLE}
MODE: production
ENVIRONMENT: ${ENVIRONMENT:-default}
image: splicemachine/sm_k8_bobby:0.1.29
image: splicemachine/sm_k8_bobby:0.1.30
build:
args:
server_image_tag: 0.0.15
Expand All @@ -65,7 +65,7 @@ services:
AIRFLOW_URL: "http://host.docker.internal:8081/api/v1"
AIRFLOW_USER: airflow
AIRFLOW_PASSWORD: airflow
image: splicemachine/sm_k8_feature_store:0.0.3
image: splicemachine/sm_k8_feature_store:0.0.4
ports:
- "8000:8000"
build:
Expand Down
2 changes: 1 addition & 1 deletion shared/shared/models/splice_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class Job(SQLAlchemyClient.SpliceBase):
nullable=False)

status: Column = Column(String(SHORT_VARCHAR_SIZE), default='PENDING')
logs: Column = deferred(Column(String(24000), default='---Job Logs---\n'))
logs: Column = deferred(Column(Text, default='---Job Logs---\n'))

payload: Column = Column(Text, nullable=False)
user: Column = Column(String(SHORT_VARCHAR_SIZE), nullable=False)
Expand Down

0 comments on commit 27ed0eb

Please sign in to comment.