----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/39432/#review104366 -----------------------------------------------------------
Vinod, can you please help check if we can merge this? Thanks! - Guangya Liu On 十月 23, 2015, 2:01 a.m., Guangya Liu wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/39432/ > ----------------------------------------------------------- > > (Updated 十月 23, 2015, 2:01 a.m.) > > > Review request for mesos and Vinod Kone. > > > Bugs: MESOS-3735 > https://issues.apache.org/jira/browse/MESOS-3735 > > > Repository: mesos > > > Description > ------- > > Add /master/frameworks to master endpoint > > > Diffs > ----- > > src/master/http.cpp 093f79384916dc08b32b70d3614e0ff314825c42 > src/master/master.hpp 3aa7017287506938d77bbfb1e06f510101009ee3 > src/master/master.cpp 0981428f5a93242d6fb3f68fb93d5f8ee6178ace > src/tests/master_tests.cpp ee2473997ccbd1c50d0cbf65d1259ea2dfe82971 > > Diff: https://reviews.apache.org/r/39432/diff/ > > > Testing > ------- > > Unit Test: > [==========] Running 2 tests from 1 test case. > [----------] Global test environment set-up. > [----------] 2 tests from MasterTest > [ RUN ] MasterTest.FrameworksEndpointWithoutFrameworks > [ OK ] MasterTest.FrameworksEndpointWithoutFrameworks (804 ms) > [ RUN ] MasterTest.FrameworksEndpointOneFramework > [ OK ] MasterTest.FrameworksEndpointOneFramework (918 ms) > [----------] 2 tests from MasterTest (1722 ms total) > > [----------] Global test environment tear-down > [==========] 2 tests from 1 test case ran. (1742 ms total) > [ PASSED ] 2 tests. > > > gyliu@devstack007:~$ curl "http://9.111.242.187:5050/master/frameworks"; > 2>/dev/null| jq . > { > "unregistered_frameworks": [], > "frameworks": [ > { > "webui_url": "", > "user": "root", > "used_resources": { > "mem": 256, > "disk": 0, > "cpus": 1 > }, > "unregistered_time": 0, > "id": "820e082f-be7c-4b59-abc5-9c02f9e8d66d-0000", > "hostname": "devstack007.cn.ibm.com", > "failover_timeout": 0, > "executors": [], > "completed_tasks": [], > "checkpoint": false, > "capabilities": [], > "active": true, > "name": "", > "offered_resources": { > "mem": 0, > "disk": 0, > "cpus": 0 > }, > "offers": [], > "pid": > "[email protected]:60454", > "registered_time": 1445236263.95058, > "resources": { > "mem": 256, > "disk": 0, > "cpus": 1 > }, > "role": "*", > "tasks": [ > { > "statuses": [ > { > "timestamp": 1445236266.63443, > "state": "TASK_RUNNING", > "container_status": { > "network_infos": [ > { > "ip_address": "9.111.242.187" > } > ] > } > } > ], > "state": "TASK_RUNNING", > "slave_id": "3e0df733-08b3-4883-b3fa-92bdc0c05b2f-S0", > "resources": { > "mem": 256, > "disk": 0, > "cpus": 1 > }, > "name": "cluster-test", > "id": "cluster-test", > "framework_id": "820e082f-be7c-4b59-abc5-9c02f9e8d66d-0000", > "executor_id": "" > } > ] > } > ], > "completed_frameworks": [] > } > > > Thanks, > > Guangya Liu > >
