Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2153 from de3/devel 

fix upgrade/install foxx in cluster environment
This commit is contained in:
Kaveh Vahedipour 2016-11-17 15:34:35 +01:00 committed by GitHub
parent 8ac79712a0 69ee438be3
commit acb187851f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/server/modules/@arangodb/foxx/manager.js
View File

@ -616,7 +616,7 @@ function uploadToPeerCoordinators (serviceInfo, coordinators) {
let coordOptions = { let coordOptions = {
coordTransactionID: ArangoClusterComm.getId() coordTransactionID: ArangoClusterComm.getId()
}; };
let req = fs.readBuffer(joinPath(fs.getTempPath(), serviceInfo)); let req = fs.readBuffer(serviceInfo);
let httpOptions = {}; let httpOptions = {};
let mapping = {}; let mapping = {};
for (let i = 0; i < coordinators.length; ++i) { for (let i = 0; i < coordinators.length; ++i) {
@ -1366,7 +1366,7 @@ function replace (serviceInfo, mount, options) {
/* jshint -W075:true */ /* jshint -W075:true */
let intReq = {appInfo: b.filename, mount, options: intOpts}; let intReq = {appInfo: b.filename, mount, options: intOpts};
/* jshint -W075:false */ /* jshint -W075:false */
ArangoClusterComm.asyncRequest('POST', 'server:' + mapping[res[i].coordinatorTransactionID], db._name(), ArangoClusterComm.asyncRequest('POST', 'server:' + mapping[res[i].clientTransactionID], db._name(),
'/_admin/foxx/replace', JSON.stringify(intReq), httpOptions, coordOptions); '/_admin/foxx/replace', JSON.stringify(intReq), httpOptions, coordOptions);
} }
cluster.wait(coordOptions, res.length); cluster.wait(coordOptions, res.length);
@ -1437,8 +1437,8 @@ function upgrade (serviceInfo, mount, options) {
/* jshint -W075:true */ /* jshint -W075:true */
let intReq = {appInfo: b.filename, mount, options: intOpts}; let intReq = {appInfo: b.filename, mount, options: intOpts};
/* jshint -W075:false */ /* jshint -W075:false */
ArangoClusterComm.asyncRequest('POST', 'server:' + mapping[res[i].coordinatorTransactionID], db._name(), ArangoClusterComm.asyncRequest('POST', 'server:' + mapping[res[i].clientTransactionID], db._name(),
'/_admin/foxx/update', JSON.stringify(intReq), httpOptions, coordOptions); '/_admin/foxx/upgrade', JSON.stringify(intReq), httpOptions, coordOptions);
} }
cluster.wait(coordOptions, res.length); cluster.wait(coordOptions, res.length);
} else { } else {
@ -1455,7 +1455,7 @@ function upgrade (serviceInfo, mount, options) {
req = JSON.stringify(req); req = JSON.stringify(req);
for (let i = 0; i < coordinators.length; ++i) { for (let i = 0; i < coordinators.length; ++i) {
ArangoClusterComm.asyncRequest('POST', 'server:' + coordinators[i], db._name(), ArangoClusterComm.asyncRequest('POST', 'server:' + coordinators[i], db._name(),
'/_admin/foxx/update', req, httpOptions, coordOptions); '/_admin/foxx/upgrade', req, httpOptions, coordOptions);
} }
cluster.wait(coordOptions, coordinators.length); cluster.wait(coordOptions, coordinators.length);
} }