Skip to content

Commit 1765232

Browse files
kelvenykelveny
committed
Improve component lifecycle management with system run-level concept
1 parent da2e646 commit 1765232

160 files changed

Lines changed: 1388 additions & 1751 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,34 @@ public boolean stop() {
127127
return true;
128128
}
129129

130+
@Override
131+
public void setName(String name) {
132+
// TODO Auto-generated method stub
133+
134+
}
135+
136+
@Override
137+
public void setConfigParams(Map<String, Object> params) {
138+
// TODO Auto-generated method stub
139+
140+
}
141+
142+
@Override
143+
public Map<String, Object> getConfigParams() {
144+
// TODO Auto-generated method stub
145+
return null;
146+
}
147+
148+
@Override
149+
public int getRunLevel() {
150+
// TODO Auto-generated method stub
151+
return 0;
152+
}
153+
154+
@Override
155+
public void setRunLevel(int level) {
156+
// TODO Auto-generated method stub
157+
158+
}
159+
130160
}

‎agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,34 @@ public InetAddress getDhcpServerIP() {
139139
return null;
140140
}
141141

142+
@Override
143+
public void setName(String name) {
144+
// TODO Auto-generated method stub
145+
146+
}
147+
148+
@Override
149+
public void setConfigParams(Map<String, Object> params) {
150+
// TODO Auto-generated method stub
151+
152+
}
153+
154+
@Override
155+
public Map<String, Object> getConfigParams() {
156+
// TODO Auto-generated method stub
157+
return null;
158+
}
159+
160+
@Override
161+
public int getRunLevel() {
162+
// TODO Auto-generated method stub
163+
return 0;
164+
}
165+
166+
@Override
167+
public void setRunLevel(int level) {
168+
// TODO Auto-generated method stub
169+
170+
}
171+
142172
}

‎agent/src/com/cloud/agent/resource/DummyResource.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,4 +224,34 @@ public IAgentControl getAgentControl() {
224224
public void setAgentControl(IAgentControl agentControl) {
225225
_agentControl = agentControl;
226226
}
227+
228+
@Override
229+
public void setName(String name) {
230+
// TODO Auto-generated method stub
231+
232+
}
233+
234+
@Override
235+
public void setConfigParams(Map<String, Object> params) {
236+
// TODO Auto-generated method stub
237+
238+
}
239+
240+
@Override
241+
public Map<String, Object> getConfigParams() {
242+
// TODO Auto-generated method stub
243+
return null;
244+
}
245+
246+
@Override
247+
public int getRunLevel() {
248+
// TODO Auto-generated method stub
249+
return 0;
250+
}
251+
252+
@Override
253+
public void setRunLevel(int level) {
254+
// TODO Auto-generated method stub
255+
256+
}
227257
}

‎agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
* server.
7878
*
7979
*/
80-
public class ConsoleProxyResource extends ServerResourceBase implements
80+
public abstract class ConsoleProxyResource extends ServerResourceBase implements
8181
ServerResource {
8282
static final Logger s_logger = Logger.getLogger(ConsoleProxyResource.class);
8383

‎awsapi/src/com/cloud/bridge/service/EC2MainServlet.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.io.OutputStreamWriter;
2222
import java.util.UUID;
2323

24-
import javax.annotation.PostConstruct;
2524
import javax.inject.Inject;
2625
import javax.servlet.RequestDispatcher;
2726
import javax.servlet.ServletConfig;

‎core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
import com.cloud.network.HAProxyConfigurator;
7777
import com.cloud.network.LoadBalancerConfigurator;
7878
import com.cloud.utils.NumbersUtil;
79+
import com.cloud.utils.component.ComponentLifecycle;
7980
import com.cloud.utils.component.Manager;
8081
import com.cloud.utils.net.NetUtils;
8182
import com.cloud.utils.script.OutputInterpreter;
@@ -1152,22 +1153,48 @@ public String connect(final String ipAddress, final int port) {
11521153
public String getName() {
11531154
return _name;
11541155
}
1155-
1156+
1157+
@Override
1158+
public void setName(String name) {
1159+
_name = name;
1160+
}
11561161

11571162

11581163
@Override
11591164
public boolean start() {
11601165
return true;
11611166
}
11621167

1163-
1164-
11651168
@Override
11661169
public boolean stop() {
11671170
return true;
11681171
}
11691172

1173+
@Override
1174+
public int getRunLevel() {
1175+
return ComponentLifecycle.RUN_LEVEL_COMPONENT;
1176+
}
1177+
1178+
public void setRunLevel() {
1179+
}
11701180

1181+
@Override
1182+
public void setConfigParams(Map<String, Object> params) {
1183+
// TODO Auto-generated method stub
1184+
1185+
}
1186+
1187+
@Override
1188+
public Map<String, Object> getConfigParams() {
1189+
// TODO Auto-generated method stub
1190+
return null;
1191+
}
1192+
1193+
@Override
1194+
public void setRunLevel(int level) {
1195+
// TODO Auto-generated method stub
1196+
1197+
}
11711198
}
11721199

11731200

‎core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
// under the License.
1717
package com.cloud.hypervisor.hyperv.resource;
1818

19+
import java.util.Map;
20+
1921
import com.cloud.agent.api.Answer;
2022
import com.cloud.agent.api.Command;
2123
import com.cloud.agent.api.PingCommand;
@@ -61,4 +63,34 @@ protected String getDefaultScriptsDir() {
6163
return null;
6264
}
6365

66+
@Override
67+
public void setName(String name) {
68+
// TODO Auto-generated method stub
69+
70+
}
71+
72+
@Override
73+
public void setConfigParams(Map<String, Object> params) {
74+
// TODO Auto-generated method stub
75+
76+
}
77+
78+
@Override
79+
public Map<String, Object> getConfigParams() {
80+
// TODO Auto-generated method stub
81+
return null;
82+
}
83+
84+
@Override
85+
public int getRunLevel() {
86+
// TODO Auto-generated method stub
87+
return 0;
88+
}
89+
90+
@Override
91+
public void setRunLevel(int level) {
92+
// TODO Auto-generated method stub
93+
94+
}
95+
6496
}

‎core/src/com/cloud/hypervisor/hyperv/resource/HypervResource.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,4 +945,34 @@ protected String getDefaultScriptsDir() {
945945
// TODO Auto-generated method stub
946946
return null;
947947
}
948+
949+
@Override
950+
public void setName(String name) {
951+
// TODO Auto-generated method stub
952+
953+
}
954+
955+
@Override
956+
public void setConfigParams(Map<String, Object> params) {
957+
// TODO Auto-generated method stub
958+
959+
}
960+
961+
@Override
962+
public Map<String, Object> getConfigParams() {
963+
// TODO Auto-generated method stub
964+
return null;
965+
}
966+
967+
@Override
968+
public int getRunLevel() {
969+
// TODO Auto-generated method stub
970+
return 0;
971+
}
972+
973+
@Override
974+
public void setRunLevel(int level) {
975+
// TODO Auto-generated method stub
976+
977+
}
948978
}

‎core/src/com/cloud/network/resource/TrafficSentinelResource.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,4 +313,34 @@ private String getDateString(Date date){
313313
DateFormat dfDate = new SimpleDateFormat("yyyyMMdd HH:mm:ss");
314314
return dfDate.format(date);
315315
}
316+
317+
@Override
318+
public void setName(String name) {
319+
// TODO Auto-generated method stub
320+
321+
}
322+
323+
@Override
324+
public void setConfigParams(Map<String, Object> params) {
325+
// TODO Auto-generated method stub
326+
327+
}
328+
329+
@Override
330+
public Map<String, Object> getConfigParams() {
331+
// TODO Auto-generated method stub
332+
return null;
333+
}
334+
335+
@Override
336+
public int getRunLevel() {
337+
// TODO Auto-generated method stub
338+
return 0;
339+
}
340+
341+
@Override
342+
public void setRunLevel(int level) {
343+
// TODO Auto-generated method stub
344+
345+
}
316346
}

‎core/src/com/cloud/storage/JavaStorageLayer.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,36 @@ public long getUsedSpace(String path) {
250250
File file = new File(path);
251251
return file.getTotalSpace() - file.getFreeSpace();
252252
}
253+
254+
@Override
255+
public void setName(String name) {
256+
// TODO Auto-generated method stub
257+
258+
}
259+
260+
@Override
261+
public void setConfigParams(Map<String, Object> params) {
262+
// TODO Auto-generated method stub
263+
264+
}
265+
266+
@Override
267+
public Map<String, Object> getConfigParams() {
268+
// TODO Auto-generated method stub
269+
return null;
270+
}
271+
272+
@Override
273+
public int getRunLevel() {
274+
// TODO Auto-generated method stub
275+
return 0;
276+
}
277+
278+
@Override
279+
public void setRunLevel(int level) {
280+
// TODO Auto-generated method stub
281+
282+
}
253283

254284

255285

0 commit comments

Comments
 (0)