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
1=== modified file 'CONFIGFILES'
2--- CONFIGFILES 2016-02-22 01:29:01 +0000
3+++ CONFIGFILES 2016-09-08 08:23:23 +0000
4@@ -189,11 +189,11 @@
5 in Registry.ini, otherwise invocations on a scope that needs to be activated
6 first can fail, even though the activation succeeded.
7
8- Only values in the range 10 to 15000 milliseconds are accepted. (Values outside
9+ Only values in the range 10 to 60000 milliseconds are accepted. (Values outside
10 this range would either cause locate() to falsely conclude that a scope
11 could not be started, or cause an unacceptably long wait time.)
12
13- Only values in the range 10 to 15000 milliseconds are accepted.
14+ Only values in the range 10 to 60000 milliseconds are accepted.
15
16 The default value is 5000 milliseconds.
17
18@@ -202,7 +202,7 @@
19 The timeout to be used when invoking a twoway operation on the registry other
20 than locate().
21
22- Only values in the range 10 to 15000 milliseconds are accepted.
23+ Only values in the range 10 to 60000 milliseconds are accepted.
24
25 The default value is 5000 milliseconds.
26
27@@ -212,7 +212,7 @@
28 on a scope. These methods require more time to execute than other scope methods
29 as they read from and write to disk.
30
31- Only values in the range 10 to 15000 milliseconds are accepted.
32+ Only values in the range 10 to 60000 milliseconds are accepted.
33
34 The default value is 2000 milliseconds.
35
36@@ -269,7 +269,7 @@
37 or terminate correctly. If a scope does not respond
38 within the allotted time, it is killed with SIGKILL.
39
40- Only values in the range 10 to 15000 milliseconds are accepted.
41+ Only values in the range 10 to 60000 milliseconds are accepted.
42
43 The default value is 4000 milliseconds.
44
45
46=== modified file 'src/scopes/internal/RegistryConfig.cpp'
47--- src/scopes/internal/RegistryConfig.cpp 2015-08-04 04:56:01 +0000
48+++ src/scopes/internal/RegistryConfig.cpp 2016-09-08 08:23:23 +0000
49@@ -71,9 +71,9 @@
50 throw ConfigException(configfile + ": " + scoperunner_path_key + " must be an absolute path");
51 }
52 process_timeout_ = get_optional_int(registry_config_group, process_timeout_key, DFLT_PROCESS_TIMEOUT);
53- if (process_timeout_ < 10 || process_timeout_ > 15000)
54+ if (process_timeout_ < 10 || process_timeout_ > 60000)
55 {
56- throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-15000 ms");
57+ throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-60000 ms");
58 }
59
60 KnownEntries const known_entries = {
61
62=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
63--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp 2015-07-01 10:59:49 +0000
64+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp 2016-09-08 08:23:23 +0000
65@@ -80,21 +80,21 @@
66 }
67
68 registry_timeout_ = get_optional_int(zmq_config_group, registry_timeout_key, DFLT_ZMQ_REGISTRY_TIMEOUT);
69- if (registry_timeout_ < 10 || registry_timeout_ > 15000)
70+ if (registry_timeout_ < 10 || registry_timeout_ > 60000)
71 {
72- throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-15000");
73+ throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-60000");
74 }
75
76 locate_timeout_ = get_optional_int(zmq_config_group, locate_timeout_key, DFLT_ZMQ_LOCATE_TIMEOUT);
77- if (locate_timeout_ < 10 || locate_timeout_ > 15000)
78+ if (locate_timeout_ < 10 || locate_timeout_ > 60000)
79 {
80- throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-15000");
81+ throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-60000");
82 }
83
84 child_scopes_timeout_ = get_optional_int(zmq_config_group, child_scopes_timeout_key, DFLT_ZMQ_CHILDSCOPES_TIMEOUT);
85- if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 15000)
86+ if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 60000)
87 {
88- throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-15000");
89+ throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-60000");
90 }
91
92 registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);

Subscribers

People subscribed via source and target branches

to all changes: