shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-16 09:57:23 +03:00
Code Releases Wiki Activity

Merge pull request #92 from unistra/feature-4404

Browse Source 
Feature #4404: Add ONE_XMLRPC attribute in the scheduler configuration file
This commit is contained in:
Ruben S. Montero 2016-04-12 22:44:09 +02:00
commit 1713a7aa49
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scheduler/etc/sched.conf
View File

@ -9,7 +9,7 @@
# #
# XMLRPC_TIMEOUT: Seconds to timeout XML-RPC calls to oned # XMLRPC_TIMEOUT: Seconds to timeout XML-RPC calls to oned
# #
# ONED_PORT: Port to connect to the OpenNebula daemon (oned) # ONE_XMLRPC: URL to connect to the OpenNebula daemon (oned)
# #
# SCHED_INTERVAL: Seconds between two scheduling actions # SCHED_INTERVAL: Seconds between two scheduling actions
# #
@ -69,7 +69,7 @@
MESSAGE_SIZE = 1073741824 MESSAGE_SIZE = 1073741824
TIMEOUT = 60 TIMEOUT = 60
ONED_PORT = 2633 ONE_XMLRPC = "http://localhost:2633/RPC2"
SCHED_INTERVAL = 30 SCHED_INTERVAL = 30

4
src/scheduler/include/Scheduler.h
View File

@ -58,7 +58,7 @@ protected:
upool(0), upool(0),
acls(0), acls(0),
timer(0), timer(0),
url(""), one_xmlrpc(""),
machines_limit(0), machines_limit(0),
dispatch_limit(0), dispatch_limit(0),
host_dispatch_limit(0) host_dispatch_limit(0)
@ -155,7 +155,7 @@ private:
time_t timer; time_t timer;
string url; string one_xmlrpc;
/** /**
* Limit of pending virtual machines to process from the pool. * Limit of pending virtual machines to process from the pool.

9
src/scheduler/src/sched/Scheduler.cc
View File

@ -108,7 +108,6 @@ void Scheduler::start()
string etc_path; string etc_path;
int oned_port;
unsigned int live_rescheds; unsigned int live_rescheds;
pthread_attr_t pattr; pthread_attr_t pattr;
@ -143,11 +142,7 @@ void Scheduler::start()
throw runtime_error("Error reading configuration file."); throw runtime_error("Error reading configuration file.");
} }
conf.get("ONED_PORT", oned_port); conf.get("ONE_XMLRPC", one_xmlrpc);
oss.str("");
oss << "http://localhost:" << oned_port << "/RPC2";
url = oss.str();
conf.get("SCHED_INTERVAL", timer); conf.get("SCHED_INTERVAL", timer);
@ -232,7 +227,7 @@ void Scheduler::start()
conf.get("TIMEOUT", timeout); conf.get("TIMEOUT", timeout);
Client::initialize("", url, message_size, timeout); Client::initialize("", one_xmlrpc, message_size, timeout);
oss.str(""); oss.str("");