Skip to content

JE-65166 [DBaas recovery add-on] - Add additional master to recovery… #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v3.0.0
Choose a base branch
from
+13 −4
Open

JE-65166 [DBaas recovery add-on] - Add additional master to recovery… #215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions addons/recovery/scripts/db-recovery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ var SQLDB = "sqldb",
nodeGroups,
donorIps = {},
primaryDonorIp = "",
additionalPrimary = "",
scenario = "",
scheme,
item,
Expand Down Expand Up @@ -82,7 +83,7 @@ if (isRestore) {
resp = getNodeIdByIp(failedNodes[k].address);
if (resp.result != 0) return resp;

resp = execRecovery(failedNodes[k].scenario, donorIps[scheme], resp.nodeid);
resp = execRecovery(failedNodes[k].scenario, donorIps[scheme], resp.nodeid, additionalPrimary);
if (resp.result != 0) return resp;

resp = parseOut(resp.responses, false);
Expand Down Expand Up @@ -326,6 +327,10 @@ function parseOut(data, restoreMaster) {
resp = parseOut(resp.responses);
if (resp.result == UNABLE_RESTORE_CODE || resp.result == FAILED_CLUSTER_CODE) return resp;

if (primaryEnabledService && scheme == PRIMARY) {
additionalPrimary = failedPrimary[i].address;
}

if (resp.result == RESTORE_SUCCESS) {
failedPrimary.splice(i, 1);
}
Expand Down Expand Up @@ -433,7 +438,7 @@ function getNodeIdByIp(address) {
}
}

function execRecovery(scenario, donor, nodeid) {
function execRecovery(scenario, donor, nodeid, additionalPrimary) {
var action = "";

if (scenario && donor) {
Expand All @@ -442,9 +447,13 @@ function execRecovery(scenario, donor, nodeid) {
action = exec;
}

api.marketplace.console.WriteLog("curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v2.5.0/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + action);
if (additionalPrimary) {
action += " --additional-primary " + additionalPrimary;
}

api.marketplace.console.WriteLog("curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + action);
return cmd({
command: "curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v2.5.0/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + action,
command: "curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + action,
nodeid: nodeid || ""
});
}
Expand Down