mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding the http server to the messaging_service test

Browse Source 
To test the messaging service API it needs to be included in the
messaging service test.

To test it, start the server with --stay-alive true
then you can use the API to get the messges information:
http://localhost:10001/messaging_service/messages/exception
will return the number of exception per connection
http://localhost:10001/messaging_service/command/completed
will return the number of completed command per connection.

Note that because the two servers are running on the same machine, to
prevent port conflict, the server port will be increment by one (i.e
10001)

Signed-off-by: Amnon Heiman <amnon@cloudius-systems.com>
This commit is contained in:
Amnon Heiman
2015-05-11 15:06:06 +03:00
parent a928c7422d
commit 0ffea496ac
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@@ -467,7 +467,7 @@ urchin_core = (['database.cc',
+ [Thrift('interface/cassandra.thrift', 'Cassandra')]
+ core + libnet)
urchin_tests_dependencies = urchin_core + [
urchin_tests_dependencies = urchin_core + http + api + [
'tests/urchin/cql_test_env.cc',
'tests/urchin/cql_assertions.cc',
]

32
tests/urchin/message.cc
View File

@@ -7,6 +7,8 @@
#include "gms/gossip_digest_ack2.hh"
#include "gms/gossip_digest.hh"
#include "core/sleep.hh"
#include "http/httpd.hh"
#include "api/api.hh"
using namespace std::chrono_literals;
using namespace net;
@@ -169,18 +171,37 @@ int main(int ac, char ** av) {
app.add_options()
("server", bpo::value<std::string>(), "Server ip")
("listen-address", bpo::value<std::string>()->default_value("0.0.0.0"), "IP address to listen")
("api-port", bpo::value<uint16_t>()->default_value(10000), "Http Rest API port")
("stay-alive", bpo::value<bool>()->default_value(false), "Do not kill the test server after the test")
("cpuid", bpo::value<uint32_t>()->default_value(0), "Server cpuid");
return app.run(ac, av, [&app] {
distributed<database> db;
api::http_context ctx(db);
return app.run(ac, av, [&app, &ctx] {
auto config = app.configuration();
uint16_t api_port = config["api-port"].as<uint16_t>();
bool stay_alive = config["stay-alive"].as<bool>();
if (config.count("server")) {
api_port++;
}
const gms::inet_address listen = gms::inet_address(config["listen-address"].as<std::string>());
net::get_messaging_service().start(listen).then([config] () {
net::get_messaging_service().start(listen).then([config, api_port, &ctx, stay_alive] () {
auto testers = new distributed<tester>;
testers->start().then([testers]{
auto& server = net::get_local_messaging_service();
auto port = server.port();
std::cout << "Messaging server listening on port " << port << " ...\n";
return testers->invoke_on_all(&tester::init_handler);
}).then([testers, config] {
}).then([api_port, &ctx] {
return ctx.http_server.start();
}).then([api_port, &ctx] {
return set_server(ctx);
}).then([&ctx, api_port] {
return ctx.http_server.listen(api_port);
}).then([api_port] {
std::cout << "Seastar HTTP server listening on port " << api_port << " ...\n";
}).then([testers, config, stay_alive] {
auto t = &testers->local();
if (!config.count("server")) {
return;
@@ -197,7 +218,10 @@ int main(int ac, char ** av) {
return t->test_echo();
}).then([testers, t] {
return t->test_exception();
}).then([testers, t] {
}).then([testers, t, stay_alive] {
if (stay_alive) {
return;
}
print("=============TEST DONE===========\n");
testers->stop().then([testers] {
delete testers;