10BC0 Removed redirects for some cluster rest handler (#14425) · arangodb/arangodb@cfe0871 · GitHub
[go: up one dir, main page]
Skip to content

Commit cfe0871

Browse files
Lars Maierjsteemann
Lars Maier
and
jsteemann
authored
Removed redirects for some cluster rest handler (#14425)
Co-authored-by: jsteemann <jsteemann@users.noreply.github.com>
1 parent 5976f89 commit cfe0871

File tree

10 files changed

+19
-144
lines changed

10 files changed

+19
-144
lines changed

‎CHANGELOG‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
devel
22
-----
33

4+
* Removed redirects from /_admin/cluster* to /_admin/cluster/*. Adjusted
5+
internal requests to use the new url.
6+
47
* Fix display of running and slow queries in web UI when there are multiple
58
coordinators. Previously, the display order of queries was undefined, which
69
could lead to queries from one coordinator being display on top once and

‎Documentation/DocuBlocks/Rest/Cluster/get_cluster_statistics.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@startDocuBlock get_cluster_statistics
33
@brief allows to query the statistics of a DB-Server in the cluster
44

5-
@RESTHEADER{GET /_admin/clusterStatistics, Queries statistics of a DB-Server}
5+
@RESTHEADER{GET /_admin/cluster/statistics, Queries statistics of a DB-Server}
66

77
@RESTQUERYPARAMETERS
88

@@ -13,10 +13,12 @@ Queries the statistics of the given DB-Server
1313

1414
@RESTRETURNCODES
1515

16-
@RESTRETURNCODE{200} is returned when everything went well.
16+
@RESTRETURNCODE{200}
17+
is returned when everything went well.
1718

18-
@RESTRETURNCODE{400} the parameter DBserver was not given or is not the
19-
ID of a DB-Server
19+
@RESTRETURNCODE{400}
20+
the parameter DBserver was not given or is not the ID of a DB-Server
2021

21-
@RESTRETURNCODE{403} server is not a Coordinator.
22+
@RESTRETURNCODE{403}
23+
server is not a DB-Server.
2224
@endDocuBlock

‎arangod/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,6 @@ set(LIB_ARANGOSERVER_SOURCES
714714
RestHandler/RestPleaseUpgradeHandler.cpp
715715
RestHandler/RestQueryCacheHandler.cpp
716716
RestHandler/RestQueryHandler.cpp
717-
RestHandler/RestRedirectHandler.cpp
718717
RestHandler/RestShutdownHandler.cpp
719718
RestHandler/RestSimpleHandler.cpp
720719
RestHandler/RestSimpleQueryHandler.cpp

‎arangod/GeneralServer/GeneralServerFeature.cpp‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
#include "RestHandler/RestPregelHandler.h"
8383
#include "RestHandler/RestQueryCacheHandler.h"
8484
#include "RestHandler/RestQueryHandler.h"
85-
#include "RestHandler/RestRedirectHandler.h"
8685
#include "RestHandler/RestShutdownHandler.h"
8786
#include "RestHandler/RestSimpleHandler.h"
8887
#include "RestHandler/RestSimpleQueryHandler.h"
@@ -631,22 +630,6 @@ void GeneralServerFeature::defineHandlers() {
631630

632631
_handlerFactory->addPrefixHandler("/", RestHandlerCreator<RestActionHandler>::createNoData);
633632

634-
// ...........................................................................
635-
// redirects
636-
// ...........................................................................
637-
638-
// UGLY HACK INCOMING!
639-
640-
#define ADD_REDIRECT(from, to) do{_handlerFactory->addPrefixHandler(from, \
641-
RestHandlerCreator<RestRedirectHandler>::createData<const char*>, \
642-
(void*) to);}while(0)
643-
644-
ADD_REDIRECT("/_admin/clusterNodeVersion", "/_admin/cluster/nodeVersion");
645-
ADD_REDIRECT("/_admin/clusterNodeEngine", "/_admin/cluster/nodeEngine");
646-
ADD_REDIRECT("/_admin/clusterNodeStats", "/_admin/cluster/nodeStatistics");
647-
ADD_REDIRECT("/_admin/clusterStatistics", "/_admin/cluster/statistics");
648-
649-
650633
// engine specific handlers
651634
StorageEngine& engine = server().getFeature<EngineSelectorFeature>().engine();
652635
engine.addRestHandlers(*_handlerFactory);

‎arangod/RestHandler/RestRedirectHandler.cpp‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎arangod/RestHandler/RestRedirectHandler.h‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/clusterView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
var stat = new window.Statistics({name: dbserver.id});
130130
stat.url = coord.get('protocol') + '://' +
131131
coord.get(& 2F26 #39;address') +
132-
'/_admin/clusterStatistics?DBserver=' +
132+
'/_admin/cluster/statistics?DBserver=' +
133133
dbserver.get('name');
134134
self.statCollectDBS.add(stat);
135135
});

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/showClusterView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331

332332
stat.url = coord.get('protocol') + '://' +
333333
coord.get('address') +
334-
'/_admin/clusterStatistics?DBserver=' +
334+
'/_admin/cluster/statistics?DBserver=' +
335335
dbserver.get('name');
336336

337337
statCollect.add(stat);

‎tests/js/client/authentication/admin-cluster-apis.js‎

Lines changed: 3 additions & 15 deletions
76
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,19 @@ function AuthSuite() {
5151
};
5252

5353
let checkClusterNodeVersion = function() {
54-
// this will just redirect to a new endpoint
55-
let result = arango.GET('/_admin/clusterNodeVersion?ServerID=' + servers[0]);
56-
assertEqual(308, result.code);
57-
58-
result = arango.GET('/_admin/cluster/nodeVersion?ServerID=' + servers[0]);
54+
let result = arango.GET('/_admin/cluster/nodeVersion?ServerID=' + servers[0]);
5955
assertTrue(result.hasOwnProperty('server'), result);
6056
assertTrue(result.hasOwnProperty('license'), result);
6157
assertTrue(result.hasOwnProperty('version'), result);
6258
};
6359

6460
let checkClusterNodeEngine = function() {
65-
// this will just redirect to a new endpoint
66-
let result = arango.GET('/_admin/clusterNodeEngine?ServerID=' + servers[0]);
67-
assertEqual(308, result.code);
68-
69-
result = arango.GET('/_admin/cluster/nodeEngine?ServerID=' + servers[0]);
61+
let result = arango.GET('/_admin/cluster/nodeEngine?ServerID=' + servers[0]);
7062
assertTrue(result.hasOwnProperty('name'), result);
7163
};
7264

7365
let checkClusterNodeStats = function() {
74-
// this will just redirect to a new endpoint
75-
let result = arango.GET('/_admin/clusterNodeStats?ServerID=' + servers[0]);
-
assertEqual(308, result.code);
77-
78-
result = arango.GET('/_admin/cluster/nodeStatistics?ServerID=' + servers[0]);
66+
let result = arango.GET('/_admin/cluster/nodeStatistics?ServerID=' + servers[0]);
7967
assertTrue(result.hasOwnProperty('time'), result);
8068
assertTrue(result.hasOwnProperty('system'), result);
8169
};

‎tests/js/server/shell/shell-readonly-mode-spec.js‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,7 @@ describe('Readonly mode api', function() {
153153
}
154154

155155
let server = setReadOnlyAndGetDBServer();
156-
let resp = download(endpoint + '/_admin/clusterNodeVersion?ServerID=' + server);
157-
expect(resp.code).to.equal(308);
158-
159-
resp = download(endpoint + '/_admin/cluster/nodeVersion?ServerID=' + server);
156+
let resp = download(endpoint + '/_admin/cluster/nodeVersion?ServerID=' + server);
160157
expect(resp.code).to.equal(200);
161158
});
162159

@@ -166,23 +163,17 @@ describe('Readonly mode api', function() {
166163
}
167164

168165
let server = setReadOnlyAndGetDBServer();
169-
let resp = download(endpoint + '/_admin/clusterNodeEngine?ServerID=' + server);
170-
expect(resp.code).to.equal(308);
171-
172-
resp = download(endpoint + '/_admin/cluster/nodeEngine?ServerID=' + server);
166+
let resp = download(endpoint + '/_admin/cluster/nodeEngine?ServerID=' + server);
173167
expect(resp.code).to.equal(200);
174168
});
175169

176-
it('can still access cluster/nodeStats API when readonly', function() {
170+
it('can still access cluster/nodeStatistics API when readonly', function() {
177171
if (!isCluster) {
178172
return;
179173
}
180174

181175
let server = setReadOnlyAndGetDBServer();
182-
let resp = download(endpoint + '/_admin/clusterNodeStats?ServerID=' + server);
183-
expect(resp.code).to.equal(308);
184-
185-
resp = download(endpoint + '/_admin/cluster/nodeStatistics?ServerID=' + server);
176+
let resp = download(endpoint + '/_admin/cluster/nodeStatistics?ServerID=' + server);
186177
expect(resp.code).to.equal(200);
187178
});
188179

0 commit comments

Comments
 (0)
0