apiserver: Close rows before reusing tx (kubeflow#3099)

* apiserver: Close rows before reusing tx Reusing tx before closing rows (might) result in the following error: [mysql] 2020/02/17 11:55:38 packets.go:427: busy buffer This closes kubeflow#3098 * Add comment as requested by reviewer
Jeffwan · Dec 9, 2020 · 2ffc804 · 2ffc804
1 parent 88ea38a
commit 2ffc804
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/backend/src/apiserver/storage/db_status_store.go b/backend/src/apiserver/storage/db_status_store.go
@@ -46,10 +46,11 @@ func (s *DBStatusStore) InitializeDBStatusTable() error {
 		tx.Rollback()
 		return util.NewInternalServerError(err, "Failed to load database status.")
 	}
-	defer rows.Close()
+	next := rows.Next()
+	rows.Close() // "rows" shouldn't be used after this point.
 
 	// The table is not initialized
-	if !rows.Next() {
+	if !next {
 		sql, args, queryErr := sq.
 			Insert("db_statuses").
 			SetMap(defaultDBStatus).

diff --git a/backend/src/apiserver/storage/default_experiment_store.go b/backend/src/apiserver/storage/default_experiment_store.go
@@ -48,10 +48,11 @@ func (s *DefaultExperimentStore) initializeDefaultExperimentTable() error {
 		tx.Rollback()
 		return util.NewInternalServerError(err, "Failed to get default experiment.")
 	}
-	defer rows.Close()
+	next := rows.Next()
+	rows.Close()
 
 	// If the table is not initialized, then set the default value.
-	if !rows.Next() {
+	if !next {
 		sql, args, queryErr := sq.
 			Insert("default_experiments").
 			SetMap(defaultExperimentDBValue).