Skip to content

Commit e0e9d64

Browse files
committed
Address review comments
1 parent 9a66f93 commit e0e9d64

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3557,8 +3557,7 @@ public void reallyRun() {
35573557
final List<Long> networkIds = _networksDao.findNetworksToGarbageCollect();
35583558
final int netGcWait = NumbersUtil.parseInt(_configDao.getValue(NetworkGcWait.key()), 60);
35593559
final int netGcInterval = NumbersUtil.parseInt(_configDao.getValue(NetworkGcInterval.key()), 60);
3560-
logger.info("NetworkGarbageCollector uses '{}' seconds for GC wait.", netGcWait);
3561-
logger.info("NetworkGarbageCollector uses '{}' seconds for GC interval.", netGcInterval);
3560+
logger.info("NetworkGarbageCollector uses '{}' seconds for GC wait and '{} seconds for GC interval.", netGcWait, netGcInterval);
35623561

35633562
for (final Long networkId : networkIds) {
35643563
if (!_networkModel.isNetworkReadyForGc(networkId)) {

engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql

-5
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,3 @@ CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Read-Only Admin - Default', 'va
6969

7070
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 'setupUserTwoFactorAuthentication', 'ALLOW');
7171
CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Support Admin - Default', 'validateUserTwoFactorAuthenticationCode', 'ALLOW');
72-
73-
-- Fix dynamic setting for the network.gc.interval
74-
75-
UPDATE `cloud`.`configuration` SET `is_dynamic`=0 WHERE `name`='network.gc.interval';
76-

0 commit comments

Comments
 (0)