This repository was archived by the owner on Feb 18, 2025. It is now read-only.
actualize Vagrant and fix problems on orchestrator-agent api with sqlite backend #445
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| { | ||
| "Debug": true, | ||
| "EnableSyslog": false, | ||
| "ListenAddress": ":3000", | ||
| "MySQLTopologyUser": "orc_client_user", | ||
| "MySQLTopologyPassword": "orc_client_password", | ||
| "MySQLTopologyCredentialsConfigFile": "", | ||
| "MySQLTopologySSLPrivateKeyFile": "", | ||
| "MySQLTopologySSLCertFile": "", | ||
| "MySQLTopologySSLCAFile": "", | ||
| "MySQLTopologySSLSkipVerify": true, | ||
| "MySQLTopologyUseMutualTLS": false, | ||
| "BackendDB": "sqlite", | ||
| "SQLite3DataFile": "/usr/local/orchestrator/orchestrator.sqlite3", | ||
| "DefaultInstancePort": 3306, | ||
| "DiscoverByShowSlaveHosts": true, | ||
| "InstancePollSeconds": 5, | ||
| "UnseenInstanceForgetHours": 240, | ||
| "SnapshotTopologiesIntervalHours": 0, | ||
| "InstanceBulkOperationsWaitTimeoutSeconds": 10, | ||
| "HostnameResolveMethod": "default", | ||
| "MySQLHostnameResolveMethod": "@@hostname", | ||
| "SkipBinlogServerUnresolveCheck": true, | ||
| "ExpiryHostnameResolvesMinutes": 60, | ||
| "RejectHostnameResolvePattern": "", | ||
| "ReasonableReplicationLagSeconds": 10, | ||
| "ProblemIgnoreHostnameFilters": [], | ||
| "VerifyReplicationFilters": false, | ||
| "ReasonableMaintenanceReplicationLagSeconds": 20, | ||
| "CandidateInstanceExpireMinutes": 60, | ||
| "AuditLogFile": "", | ||
| "AuditToSyslog": false, | ||
| "RemoveTextFromHostnameDisplay": ".mydomain.com:3306", | ||
| "ReadOnly": false, | ||
| "AuthenticationMethod": "", | ||
| "HTTPAuthUser": "", | ||
| "HTTPAuthPassword": "", | ||
| "AuthUserHeader": "", | ||
| "PowerAuthUsers": [ | ||
| "*" | ||
| ], | ||
| "ClusterNameToAlias": { | ||
| "127.0.0.1": "test suite" | ||
| }, | ||
| "SlaveLagQuery": "", | ||
| "DetectClusterAliasQuery": "SELECT SUBSTRING_INDEX(@@hostname, '.', 1)", | ||
| "DetectClusterDomainQuery": "", | ||
| "DetectInstanceAliasQuery": "", | ||
| "DetectPromotionRuleQuery": "", | ||
| "DataCenterPattern": "[.]([^.]+)[.][^.]+[.]mydomain[.]com", | ||
| "PhysicalEnvironmentPattern": "[.]([^.]+[.][^.]+)[.]mydomain[.]com", | ||
| "PromotionIgnoreHostnameFilters": [], | ||
| "DetectSemiSyncEnforcedQuery": "", | ||
| "ServeAgentsHttp": false, | ||
| "AgentsServerPort": ":3001", | ||
| "AgentsUseSSL": false, | ||
| "AgentsUseMutualTLS": false, | ||
| "AgentSSLSkipVerify": false, | ||
| "AgentSSLPrivateKeyFile": "", | ||
| "AgentSSLCertFile": "", | ||
| "AgentSSLCAFile": "", | ||
| "AgentSSLValidOUs": [], | ||
| "UseSSL": false, | ||
| "UseMutualTLS": false, | ||
| "SSLSkipVerify": false, | ||
| "SSLPrivateKeyFile": "", | ||
| "SSLCertFile": "", | ||
| "SSLCAFile": "", | ||
| "SSLValidOUs": [], | ||
| "URLPrefix": "", | ||
| "StatusEndpoint": "/api/status", | ||
| "StatusSimpleHealth": true, | ||
| "StatusOUVerify": false, | ||
| "AgentPollMinutes": 60, | ||
| "UnseenAgentForgetHours": 6, | ||
| "StaleSeedFailMinutes": 60, | ||
| "SeedAcceptableBytesDiff": 8192, | ||
| "PseudoGTIDPattern": "", | ||
| "PseudoGTIDPatternIsFixedSubstring": false, | ||
| "PseudoGTIDMonotonicHint": "asc:", | ||
| "DetectPseudoGTIDQuery": "", | ||
| "BinlogEventsChunkSize": 10000, | ||
| "SkipBinlogEventsContaining": [], | ||
| "ReduceReplicationAnalysisCount": true, | ||
| "FailureDetectionPeriodBlockMinutes": 60, | ||
| "RecoveryPeriodBlockSeconds": 3600, | ||
| "RecoveryIgnoreHostnameFilters": [], | ||
| "RecoverMasterClusterFilters": [ | ||
| "_master_pattern_" | ||
| ], | ||
| "RecoverIntermediateMasterClusterFilters": [ | ||
| "_intermediate_master_pattern_" | ||
| ], | ||
| "OnFailureDetectionProcesses": [ | ||
| "echo 'Detected {failureType} on {failureCluster}. Affected replicas: {countSlaves}' >> /tmp/recovery.log" | ||
| ], | ||
| "PreFailoverProcesses": [ | ||
| "echo 'Will recover from {failureType} on {failureCluster}' >> /tmp/recovery.log" | ||
| ], | ||
| "PostFailoverProcesses": [ | ||
| "echo '(for all types) Recovered from {failureType} on {failureCluster}. Failed: {failedHost}:{failedPort}; Successor: {successorHost}:{successorPort}' >> /tmp/recovery.log" | ||
| ], | ||
| "PostUnsuccessfulFailoverProcesses": [], | ||
| "PostMasterFailoverProcesses": [ | ||
| "echo 'Recovered from {failureType} on {failureCluster}. Failed: {failedHost}:{failedPort}; Promoted: {successorHost}:{successorPort}' >> /tmp/recovery.log" | ||
| ], | ||
| "PostIntermediateMasterFailoverProcesses": [ | ||
| "echo 'Recovered from {failureType} on {failureCluster}. Failed: {failedHost}:{failedPort}; Successor: {successorHost}:{successorPort}' >> /tmp/recovery.log" | ||
| ], | ||
| "CoMasterRecoveryMustPromoteOtherCoMaster": true, | ||
| "DetachLostSlavesAfterMasterFailover": true, | ||
| "ApplyMySQLPromotionAfterMasterFailover": false, | ||
| "MasterFailoverDetachSlaveMasterHost": false, | ||
| "MasterFailoverLostInstancesDowntimeMinutes": 0, | ||
| "PostponeSlaveRecoveryOnLagMinutes": 0, | ||
| "OSCIgnoreHostnameFilters": [], | ||
| "GraphiteAddr": "", | ||
| "GraphitePath": "", | ||
| "GraphiteConvertHostnameDotsToUnderscores": true | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -106,9 +106,9 @@ func SubmitAgent(hostname string, port int, token string) (string, error) { | |
| _, err := db.ExecOrchestrator(` | ||
| replace | ||
| into host_agent ( | ||
| hostname, port, token, last_submitted, count_mysql_snapshots | ||
| ) VALUES ( | ||
| ?, ?, ?, NOW(), 0 | ||
| ) | ||
| `, | ||
| hostname, | ||
|
|
@@ -164,7 +164,7 @@ func ReadOutdatedAgentsHosts() ([]string, error) { | |
| from | ||
| host_agent | ||
| where | ||
| IFNULL(last_checked < now() - interval ? minute, 1) | ||
|
Contributor
Author
There was a problem hiding this comment. this change need for SQLlite compatibility cause SQLite desn't have BOOLEAN literal |
||
| ` | ||
| err := db.QueryOrchestrator(query, sqlutils.Args(config.Config.AgentPollMinutes), func(m sqlutils.RowMap) error { | ||
| hostname := m.GetString("hostname") | ||
|
|
@@ -461,7 +461,7 @@ func MountLV(hostname string, lv string) (Agent, error) { | |
| return executeAgentCommand(hostname, fmt.Sprintf("mountlv?lv=%s", lv), nil) | ||
| } | ||
|
|
||
| // RemoveLV requests an agent to remove a snapshot | ||
| func RemoveLV(hostname string, lv string) (Agent, error) { | ||
| return executeAgentCommand(hostname, fmt.Sprintf("removelv?lv=%s", lv), nil) | ||
| } | ||
|
|
@@ -547,8 +547,8 @@ func AbortSeed(seedId int64) error { | |
| } | ||
|
|
||
| // PostCopy will request an agent to invoke post-copy commands | ||
| func PostCopy(hostname, sourceHostname string) (Agent, error) { | ||
|
Collaborator
There was a problem hiding this comment. Is this change going to break behavior for existing users?
Contributor
Author
There was a problem hiding this comment. could you help me figure out howto add optional parameter to martini routes?
Collaborator
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment. @shlomi-noach ok. and add some other improvments and tested it with percona-xtrabackup |
||
| return executeAgentCommand(hostname, fmt.Sprintf("post-copy/?sourceHost=%s", sourceHostname), nil) | ||
|
Contributor
Author
There was a problem hiding this comment. there is backwards compatibility |
||
| } | ||
|
|
||
| // SubmitSeedEntry submits a new seed operation entry, returning its unique ID | ||
|
|
@@ -693,7 +693,7 @@ func executeSeed(seedId int64, targetHostname string, sourceHostname string) err | |
| } | ||
|
|
||
| seedFromLogicalVolume := sourceAgent.LogicalVolumes[0] | ||
| seedStateId, _ = submitSeedStateEntry(seedId, fmt.Sprintf("%s Mounting logical volume: %s", sourceHostname, seedFromLogicalVolume.Path), "") | ||
|
|
||
| _, err = MountLV(sourceHostname, seedFromLogicalVolume.Path) | ||
| if err != nil { | ||
| return updateSeedStateEntry(seedStateId, err) | ||
|
|
@@ -722,8 +722,8 @@ func executeSeed(seedId int64, targetHostname string, sourceHostname string) err | |
| seedStateId, _ = submitSeedStateEntry(seedId, fmt.Sprintf("%s will now receive data in background", targetHostname), "") | ||
| ReceiveMySQLSeedData(targetHostname, seedId) | ||
|
|
||
| seedStateId, _ = submitSeedStateEntry(seedId, fmt.Sprintf("Waiting %d seconds for %s to start listening for incoming data", config.Config.SeedWaitSecondsBeforeSend, targetHostname), "") | ||
| time.Sleep(time.Duration(config.Config.SeedWaitSecondsBeforeSend) * time.Second) | ||
|
|
||
|
|
||
| seedStateId, _ = submitSeedStateEntry(seedId, fmt.Sprintf("%s will now send data to %s in background", sourceHostname, targetHostname), "") | ||
| SendMySQLSeedData(sourceHostname, targetHostname, seedId) | ||
|
|
@@ -774,12 +774,12 @@ func executeSeed(seedId int64, targetHostname string, sourceHostname string) err | |
|
|
||
| // Cleanup: | ||
| seedStateId, _ = submitSeedStateEntry(seedId, fmt.Sprintf("Executing post-copy command on %s", targetHostname), "") | ||
| _, err = PostCopy(targetHostname, sourceHostname) | ||
| if err != nil { | ||
| return updateSeedStateEntry(seedStateId, err) | ||
| } | ||
|
|
||
| seedStateId, _ = submitSeedStateEntry(seedId, fmt.Sprintf("%s Unmounting logical volume: %s", sourceHostname, seedFromLogicalVolume.Path), "") | ||
| _, err = Unmount(sourceHostname) | ||
| if err != nil { | ||
| return updateSeedStateEntry(seedStateId, err) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,33 @@ | ||
| #!/bin/bash | ||
| set -xeuo pipefail | ||
| # Install orchestrator | ||
| if [[ -e /etc/redhat-release ]]; then | ||
| rpm -i /tmp/orchestrator-release/orchestrator*.rpm | ||
| fi | ||
|
|
||
| if [[ -e /etc/debian_version ]]; then | ||
| dpkg -i /tmp/orchestrator-release/orchestrator*.deb | ||
| fi | ||
|
|
||
| if [[ -e /orchestrator/vagrant/.sqlite ]]; then | ||
| cp -fv /usr/local/orchestrator/orchestrator-sample-sqlite.conf.json /etc/orchestrator.conf.json | ||
| else | ||
| cp -fv /usr/local/orchestrator/orchestrator-sample.conf.json /etc/orchestrator.conf.json | ||
| fi | ||
|
|
||
| if [[ -e /etc/redhat-release ]]; then | ||
|
|
||
| /sbin/chkconfig orchestrator on | ||
| /sbin/service orchestrator start | ||
|
|
||
| elif [[ -e /etc/debian_version ]]; then | ||
|
|
||
| update-rc.d orchestrator defaults | ||
| /usr/sbin/service orchestrator start | ||
|
|
||
| fi | ||
|
|
||
| echo '* * * * * root /usr/bin/orchestrator -c discover -i db1' > /etc/cron.d/orchestrator-discovery | ||
|
|
||
| # Discover instances | ||
| /usr/bin/orchestrator --verbose --debug --stack -c discover -i localhost |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍