Fix the bug with 1.1 startup on Mysql after the upgrade (#879)

temporalio · Oct 20, 2020 · 7bf6bea · 7bf6bea
1 parent 6c6c87b
commit 7bf6bea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/common/persistence/cassandra/cassandraClusterMetadata.go b/common/persistence/cassandra/cassandraClusterMetadata.go
@@ -159,7 +159,7 @@ func (m *cassandraClusterMetadata) GetClusterMetadata() (*p.InternalGetClusterMe
 		return nil, convertCommonErrors("GetClusterMetadata", err)
 	}
 	// TODO(vitarb): immutable metadata is needed for backward compatibility only, remove after 1.1 release.
-	if clusterMetadata == nil {
+	if len(clusterMetadata) == 0 {
 		clusterMetadata = immutableMetadata
 		encoding = immutableMetadataEncoding
 		// Version can only be 0 for legacy records that have NULL version in the DB.

diff --git a/common/persistence/sql/sqlClusterMetadataManager.go b/common/persistence/sql/sqlClusterMetadataManager.go
@@ -51,7 +51,7 @@ func (s *sqlClusterMetadataManager) GetClusterMetadata() (*p.InternalGetClusterM
 	}
 
 	// TODO(vitarb): immutable metadata is needed for backward compatibility only, remove after 1.1 release.
-	if row.Data == nil {
+	if len(row.Data) == 0 {
 		row.Data = row.ImmutableData
 		row.DataEncoding = row.ImmutableDataEncoding
 	}