diff --git a/api/api-doc/compaction_manager.json b/api/api-doc/compaction_manager.json new file mode 100644 index 0000000000..cf12776ebf --- /dev/null +++ b/api/api-doc/compaction_manager.json @@ -0,0 +1,186 @@ +{ + "apiVersion":"0.0.1", + "swaggerVersion":"1.2", + "basePath":"{{Protocol}}://{{Host}}", + "resourcePath":"/compaction_manager", + "produces":[ + "application/json" + ], + "apis":[ + { + "path":"/compaction_manager/compactions", + "operations":[ + { + "method":"GET", + "summary":"get List of running compactions", + "type":"array", + "items":{ + "type":"jsonmap" + }, + "nickname":"get_compactions", + "produces":[ + "application/json" + ], + "parameters":[ + ] + } + ] + }, + { + "path":"/compaction_manager/compaction_summary", + "operations":[ + { + "method":"GET", + "summary":"get compaction summary", + "type":"array", + "items":{ + "type":"string" + }, + "nickname":"get_compaction_summary", + "produces":[ + "application/json" + ], + "parameters":[ + ] + } + ] + }, + { + "path":"/compaction_manager/force_user_defined_compaction", + "operations":[ + { + "method":"POST", + "summary":"Triggers the compaction of user specified sstables. You can specify files from various keyspaces and columnfamilies. If you do so, user defined compaction is performed several times to the groups of files in the same keyspace/columnfamily. must contain keyspace and columnfamily name in path(for 2.1+) or file name itself.", + "type":"void", + "nickname":"force_user_defined_compaction", + "produces":[ + "application/json" + ], + "parameters":[ + { + "name":"data_files", + "description":"a comma separated list of sstable file to compact. must contain keyspace and columnfamily name in path(for 2.1+) or file name itself", + "required":true, + "allowMultiple":false, + "type":"string", + "paramType":"query" + } + ] + } + ] + }, + { + "path":"/compaction_manager/stop_compaction", + "operations":[ + { + "method":"POST", + "summary":"Stop all running compaction-like tasks having the provided type", + "type":"void", + "nickname":"stop_compaction", + "produces":[ + "application/json" + ], + "parameters":[ + { + "name":"type", + "description":"the type of compaction to stop. Can be one of: - COMPACTION - VALIDATION - CLEANUP - SCRUB - INDEX_BUILD", + "required":true, + "allowMultiple":false, + "type":"string", + "paramType":"string" + } + ] + } + ] + }, + { + "path": "/compaction_manager/metrics/pending_tasks", + "operations": [ + { + "method": "GET", + "summary": "Get pending tasks", + "type": "int", + "nickname": "get_pending_tasks", + "produces": [ + "application/json" + ], + "parameters": [] + } + ] + }, + { + "path": "/compaction_manager/metrics/completed_tasks", + "operations": [ + { + "method": "GET", + "summary": "Get completed tasks", + "type": "long", + "nickname": "get_completed_tasks", + "produces": [ + "application/json" + ], + "parameters": [] + } + ] + }, + { + "path": "/compaction_manager/metrics/total_compactions_completed", + "operations": [ + { + "method": "GET", + "summary": "Get total compactions completed", + "type": "long", + "nickname": "get_total_compactions_completed", + "produces": [ + "application/json" + ], + "parameters": [] + } + ] + }, + { + "path": "/compaction_manager/metrics/bytes_compacted", + "operations": [ + { + "method": "GET", + "summary": "Get bytes compacted", + "type": "int", + "nickname": "get_bytes_compacted", + "produces": [ + "application/json" + ], + "parameters": [] + } + ] + } + ], + "models":{ + "mapper":{ + "id":"mapper", + "description":"A key value mapping", + "properties":{ + "key":{ + "type":"string", + "description":"The key" + }, + "value":{ + "type":"string", + "description":"The value" + } + } + }, + "jsonmap":{ + "id":"jsonmap", + "description":"A json representation of a map as a list of key value", + "properties":{ + "value":{ + "type":"array", + "items":{ + "type":"mapper" + }, + "description":"A list of key, value mapping" + } + } + } + } +} \ No newline at end of file diff --git a/api/api.cc b/api/api.cc index 9577d63372..c35be1c306 100644 --- a/api/api.cc +++ b/api/api.cc @@ -15,6 +15,7 @@ #include "storage_proxy.hh" #include "cache_service.hh" #include "collectd.hh" +#include "compaction_manager.hh" namespace api { future<> set_server(http_context& ctx) { @@ -55,6 +56,9 @@ future<> set_server(http_context& ctx) { rb->register_function(r, "collectd", "The collectd API"); set_collectd(ctx, r); + rb->register_function(r, "compaction_manager", + "The Compaction manager API"); + set_compaction_manager(ctx, r); }); } diff --git a/api/compaction_manager.cc b/api/compaction_manager.cc new file mode 100644 index 0000000000..1f198b0ceb --- /dev/null +++ b/api/compaction_manager.cc @@ -0,0 +1,63 @@ +/* + * Copyright 2015 Cloudius Systems + */ + +#include "compaction_manager.hh" +#include "api/api-doc/compaction_manager.json.hh" + +namespace api { + +using namespace scollectd; +namespace cm = httpd::compaction_manager_json; + + + +void set_compaction_manager(http_context& ctx, routes& r) { + cm::get_compactions.set(r, [] (std::unique_ptr req) { + //TBD + std::vector map; + return make_ready_future(map); + }); + + cm::get_compaction_summary.set(r, [] (std::unique_ptr req) { + //TBD + std::vector res; + return make_ready_future(res); + }); + + cm::force_user_defined_compaction.set(r, [] (std::unique_ptr req) { + //TBD + return make_ready_future(""); + }); + + cm::stop_compaction.set(r, [] (std::unique_ptr req) { + //TBD + return make_ready_future(""); + }); + + cm::get_pending_tasks.set(r, [] (std::unique_ptr req) { + //TBD + return make_ready_future(0); + }); + + cm::get_completed_tasks.set(r, [] (std::unique_ptr req) { + //TBD + return make_ready_future(0); + }); + + cm::get_total_compactions_completed.set(r, [] (std::unique_ptr req) { + //TBD + return make_ready_future(0); + }); + + cm::get_bytes_compacted.set(r, [] (std::unique_ptr req) { + //TBD + return make_ready_future(0); + }); + + + +} + +} + diff --git a/api/compaction_manager.hh b/api/compaction_manager.hh new file mode 100644 index 0000000000..4bfdafbb19 --- /dev/null +++ b/api/compaction_manager.hh @@ -0,0 +1,18 @@ +/* + * Copyright 2015 Cloudius Systems + */ + +#ifndef API_COMPACTION_MANAGER_HH_ +#define API_COMPACTION_MANAGER_HH_ + +#include "api.hh" + +namespace api { + +void set_compaction_manager(http_context& ctx, routes& r); + +} + + + +#endif /* API_COMPACTION_MANAGER_HH_ */ diff --git a/configure.py b/configure.py index f334d89e7b..3571deffe8 100755 --- a/configure.py +++ b/configure.py @@ -338,6 +338,8 @@ api = ['api/api.cc', 'api/cache_service.cc', 'api/api-doc/collectd.json', 'api/collectd.cc', + 'api/api-doc/compaction_manager.json', + 'api/compaction_manager.cc', ] boost_test_lib = [