Merge lp:~marcustomlinson/unity-scopes-api/relax-process-timeout into lp:unity-scopes-api/devel

Proposed by Marcus Tomlinson on 2016-09-08
Status: Merged
Merged at revision: 687
Proposed branch: lp:~marcustomlinson/unity-scopes-api/relax-process-timeout
Merge into: lp:unity-scopes-api/devel
Diff against target: 92 lines (+13/-13)
3 files modified
CONFIGFILES (+5/-5)
src/scopes/internal/RegistryConfig.cpp (+2/-2)
src/scopes/internal/zmq_middleware/ZmqConfig.cpp (+6/-6)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scopes-api/relax-process-timeout
Reviewer Review Type Date Requested Status
Unity Team 2016-09-08 Pending
Review via email: mp+305185@code.launchpad.net

Commit message

Up the maximum allowed process timeout to 1min

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CONFIGFILES'
--- CONFIGFILES 2016-02-22 01:29:01 +0000
+++ CONFIGFILES 2016-09-08 08:23:23 +0000
@@ -189,11 +189,11 @@
189 in Registry.ini, otherwise invocations on a scope that needs to be activated189 in Registry.ini, otherwise invocations on a scope that needs to be activated
190 first can fail, even though the activation succeeded.190 first can fail, even though the activation succeeded.
191191
192 Only values in the range 10 to 15000 milliseconds are accepted. (Values outside192 Only values in the range 10 to 60000 milliseconds are accepted. (Values outside
193 this range would either cause locate() to falsely conclude that a scope193 this range would either cause locate() to falsely conclude that a scope
194 could not be started, or cause an unacceptably long wait time.)194 could not be started, or cause an unacceptably long wait time.)
195195
196 Only values in the range 10 to 15000 milliseconds are accepted.196 Only values in the range 10 to 60000 milliseconds are accepted.
197197
198 The default value is 5000 milliseconds.198 The default value is 5000 milliseconds.
199199
@@ -202,7 +202,7 @@
202 The timeout to be used when invoking a twoway operation on the registry other202 The timeout to be used when invoking a twoway operation on the registry other
203 than locate().203 than locate().
204204
205 Only values in the range 10 to 15000 milliseconds are accepted.205 Only values in the range 10 to 60000 milliseconds are accepted.
206206
207 The default value is 5000 milliseconds.207 The default value is 5000 milliseconds.
208208
@@ -212,7 +212,7 @@
212 on a scope. These methods require more time to execute than other scope methods212 on a scope. These methods require more time to execute than other scope methods
213 as they read from and write to disk.213 as they read from and write to disk.
214214
215 Only values in the range 10 to 15000 milliseconds are accepted.215 Only values in the range 10 to 60000 milliseconds are accepted.
216216
217 The default value is 2000 milliseconds.217 The default value is 2000 milliseconds.
218218
@@ -269,7 +269,7 @@
269 or terminate correctly. If a scope does not respond269 or terminate correctly. If a scope does not respond
270 within the allotted time, it is killed with SIGKILL.270 within the allotted time, it is killed with SIGKILL.
271271
272 Only values in the range 10 to 15000 milliseconds are accepted.272 Only values in the range 10 to 60000 milliseconds are accepted.
273273
274 The default value is 4000 milliseconds.274 The default value is 4000 milliseconds.
275275
276276
=== modified file 'src/scopes/internal/RegistryConfig.cpp'
--- src/scopes/internal/RegistryConfig.cpp 2015-08-04 04:56:01 +0000
+++ src/scopes/internal/RegistryConfig.cpp 2016-09-08 08:23:23 +0000
@@ -71,9 +71,9 @@
71 throw ConfigException(configfile + ": " + scoperunner_path_key + " must be an absolute path");71 throw ConfigException(configfile + ": " + scoperunner_path_key + " must be an absolute path");
72 }72 }
73 process_timeout_ = get_optional_int(registry_config_group, process_timeout_key, DFLT_PROCESS_TIMEOUT);73 process_timeout_ = get_optional_int(registry_config_group, process_timeout_key, DFLT_PROCESS_TIMEOUT);
74 if (process_timeout_ < 10 || process_timeout_ > 15000)74 if (process_timeout_ < 10 || process_timeout_ > 60000)
75 {75 {
76 throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-15000 ms");76 throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-60000 ms");
77 }77 }
7878
79 KnownEntries const known_entries = {79 KnownEntries const known_entries = {
8080
=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp 2015-07-01 10:59:49 +0000
+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp 2016-09-08 08:23:23 +0000
@@ -80,21 +80,21 @@
80 }80 }
8181
82 registry_timeout_ = get_optional_int(zmq_config_group, registry_timeout_key, DFLT_ZMQ_REGISTRY_TIMEOUT);82 registry_timeout_ = get_optional_int(zmq_config_group, registry_timeout_key, DFLT_ZMQ_REGISTRY_TIMEOUT);
83 if (registry_timeout_ < 10 || registry_timeout_ > 15000)83 if (registry_timeout_ < 10 || registry_timeout_ > 60000)
84 {84 {
85 throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-15000");85 throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-60000");
86 }86 }
8787
88 locate_timeout_ = get_optional_int(zmq_config_group, locate_timeout_key, DFLT_ZMQ_LOCATE_TIMEOUT);88 locate_timeout_ = get_optional_int(zmq_config_group, locate_timeout_key, DFLT_ZMQ_LOCATE_TIMEOUT);
89 if (locate_timeout_ < 10 || locate_timeout_ > 15000)89 if (locate_timeout_ < 10 || locate_timeout_ > 60000)
90 {90 {
91 throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-15000");91 throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-60000");
92 }92 }
9393
94 child_scopes_timeout_ = get_optional_int(zmq_config_group, child_scopes_timeout_key, DFLT_ZMQ_CHILDSCOPES_TIMEOUT);94 child_scopes_timeout_ = get_optional_int(zmq_config_group, child_scopes_timeout_key, DFLT_ZMQ_CHILDSCOPES_TIMEOUT);
95 if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 15000)95 if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 60000)
96 {96 {
97 throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-15000");97 throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-60000");
98 }98 }
9999
100 registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);100 registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);

Subscribers

People subscribed via source and target branches

to all changes: