Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

fix out of range in semi_sync_master_timeout #1207

Merged
merged 6 commits into from
Jul 8, 2020
Merged

fix out of range in semi_sync_master_timeout #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a34df06
fix out of range in semi_sync_master_timeout
luisyonaldo Jul 7, 2020
5ea9e38
sqlite backend
luisyonaldo Jul 7, 2020
b2f9925
cleanup
luisyonaldo Jul 7, 2020
e7295e2
SemiSyncMasterTimeout int64
luisyonaldo Jul 7, 2020
e147408
Merge branch 'master' into semi-sync-master-timeout
shlomi-noach Jul 8, 2020
0af5fb2
use unsigned int
luisyonaldo Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions go/db/generate_patches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,4 +576,9 @@ var generateSQLPatches = []string{
database_instance
ADD COLUMN semi_sync_available TINYINT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_enforced
`,
`
ALTER TABLE /* sqlite3-skip */
database_instance
MODIFY semi_sync_master_timeout BIGINT UNSIGNED NOT NULL DEFAULT 0
`,
}
2 changes: 1 addition & 1 deletion go/inst/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ type Instance struct {
SemiSyncEnforced bool
SemiSyncMasterEnabled bool
SemiSyncReplicaEnabled bool
SemiSyncMasterTimeout uint
SemiSyncMasterTimeout uint64
SemiSyncMasterWaitForReplicaCount uint
SemiSyncMasterStatus bool
SemiSyncMasterClients uint
Expand Down
4 changes: 2 additions & 2 deletions go/inst/instance_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ func ReadTopologyInstanceBufferable(instanceKey *InstanceKey, bufferWrites bool,
instance.SemiSyncMasterEnabled = (m.GetString("Value") == "ON")
semiSyncMasterPluginLoaded = true
} else if m.GetString("Variable_name") == "rpl_semi_sync_master_timeout" {
instance.SemiSyncMasterTimeout = m.GetUint("Value")
instance.SemiSyncMasterTimeout = m.GetUint64("Value")
} else if m.GetString("Variable_name") == "rpl_semi_sync_master_wait_for_slave_count" {
instance.SemiSyncMasterWaitForReplicaCount = m.GetUint("Value")
} else if m.GetString("Variable_name") == "rpl_semi_sync_slave_enabled" {
Expand Down Expand Up @@ -1139,7 +1139,7 @@ func readInstanceRow(m sqlutils.RowMap) *Instance {
instance.SemiSyncEnforced = m.GetBool("semi_sync_enforced")
instance.SemiSyncAvailable = m.GetBool("semi_sync_available")
instance.SemiSyncMasterEnabled = m.GetBool("semi_sync_master_enabled")
instance.SemiSyncMasterTimeout = m.GetUint("semi_sync_master_timeout")
instance.SemiSyncMasterTimeout = m.GetUint64("semi_sync_master_timeout")
instance.SemiSyncMasterWaitForReplicaCount = m.GetUint("semi_sync_master_wait_for_slave_count")
instance.SemiSyncReplicaEnabled = m.GetBool("semi_sync_replica_enabled")
instance.SemiSyncMasterStatus = m.GetBool("semi_sync_master_status")
Expand Down