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

Proposed by Marcus Tomlinson on 2016-09-01
Status: Superseded
Proposed branch: lp:~marcustomlinson/unity-scopes-api/relax-process-timeout
Merge into: lp:unity-scopes-api
Prerequisite: lp:~stolowski/unity-scopes-api/disable-sss-test
Diff against target: 106 lines (+15/-13)
4 files modified
CONFIGFILES (+5/-5)
include/unity/scopes/testing/MockScope.h (+2/-0)
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-01 Pending
Review via email: mp+304638@code.launchpad.net

Commit message

Up the maximum allowed process timeout to 1min

To post a comment you must log in.
372. By Marcus Tomlinson on 2016-09-06

Up the maximum allowed registry timeout to 1min

373. By Marcus Tomlinson on 2016-09-08

Up locate timeout to 1min

374. By Marcus Tomlinson on 2016-09-08

Merged devel

Unmerged revisions

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 07:46:45 +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 'include/unity/scopes/testing/MockScope.h'
47--- include/unity/scopes/testing/MockScope.h 2015-05-29 10:17:42 +0000
48+++ include/unity/scopes/testing/MockScope.h 2016-09-08 07:46:45 +0000
49@@ -18,7 +18,9 @@
50
51 #pragma once
52
53+#include <unity/scopes/ActionMetadata.h>
54 #include <unity/scopes/Scope.h>
55+#include <unity/scopes/SearchMetadata.h>
56
57 #include <unity/scopes/testing/MockObject.h>
58
59
60=== modified file 'src/scopes/internal/RegistryConfig.cpp'
61--- src/scopes/internal/RegistryConfig.cpp 2015-08-04 04:56:01 +0000
62+++ src/scopes/internal/RegistryConfig.cpp 2016-09-08 07:46:45 +0000
63@@ -71,9 +71,9 @@
64 throw ConfigException(configfile + ": " + scoperunner_path_key + " must be an absolute path");
65 }
66 process_timeout_ = get_optional_int(registry_config_group, process_timeout_key, DFLT_PROCESS_TIMEOUT);
67- if (process_timeout_ < 10 || process_timeout_ > 15000)
68+ if (process_timeout_ < 10 || process_timeout_ > 60000)
69 {
70- throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-15000 ms");
71+ throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-60000 ms");
72 }
73
74 KnownEntries const known_entries = {
75
76=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
77--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp 2015-07-01 10:59:49 +0000
78+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp 2016-09-08 07:46:45 +0000
79@@ -80,21 +80,21 @@
80 }
81
82 registry_timeout_ = get_optional_int(zmq_config_group, registry_timeout_key, DFLT_ZMQ_REGISTRY_TIMEOUT);
83- if (registry_timeout_ < 10 || registry_timeout_ > 15000)
84+ if (registry_timeout_ < 10 || registry_timeout_ > 60000)
85 {
86- throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-15000");
87+ throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-60000");
88 }
89
90 locate_timeout_ = get_optional_int(zmq_config_group, locate_timeout_key, DFLT_ZMQ_LOCATE_TIMEOUT);
91- if (locate_timeout_ < 10 || locate_timeout_ > 15000)
92+ if (locate_timeout_ < 10 || locate_timeout_ > 60000)
93 {
94- throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-15000");
95+ throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-60000");
96 }
97
98 child_scopes_timeout_ = get_optional_int(zmq_config_group, child_scopes_timeout_key, DFLT_ZMQ_CHILDSCOPES_TIMEOUT);
99- if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 15000)
100+ if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 60000)
101 {
102- throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-15000");
103+ throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-60000");
104 }
105
106 registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);

Subscribers

People subscribed via source and target branches

to all changes: