From 27ed0eb9db0a6154d7df00082fbe1f3b7745c4b6 Mon Sep 17 00:00:00 2001
From: Ben Epstein <bepstein@splicemachine.com>
Date: Tue, 6 Apr 2021 18:51:42 -0400
Subject: [PATCH] Rc 2.7.0 001 (#127)

* rc1

* ready for release
---
 .../handlers/run_handlers/database_deployment_handler.py | 9 +++++----
 docker-compose.yaml                                      | 6 +++---
 shared/shared/models/splice_models.py                    | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bobby/src/handlers/run_handlers/database_deployment_handler.py b/bobby/src/handlers/run_handlers/database_deployment_handler.py
index 6fc188b3..1cfc6db3 100644
--- a/bobby/src/handlers/run_handlers/database_deployment_handler.py
+++ b/bobby/src/handlers/run_handlers/database_deployment_handler.py
@@ -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
 
@@ -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
@@ -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()
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 09729318..8a0a63e9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -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"
@@ -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
@@ -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:
diff --git a/shared/shared/models/splice_models.py b/shared/shared/models/splice_models.py
index 618d9512..c021f81b 100644
--- a/shared/shared/models/splice_models.py
+++ b/shared/shared/models/splice_models.py
@@ -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)