DaanHoogland commented on code in PR #8605: URL: https://github.com/apache/cloudstack/pull/8605#discussion_r1479366929
########## engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql: ########## @@ -0,0 +1,27 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. + +--; +-- Schema upgrade from 4.19.0.0 to 4.19.1.0 +--; + +CREATE TABLE IF NOT EXISTS `cloud`.`command_timeout` ( Review Comment: as it adds a table, I think 4.19->20 is more appropriate ########## engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java: ########## @@ -439,7 +445,18 @@ public Answer[] send(final Long hostId, final Commands commands, int timeout) th } if (timeout <= 0) { - timeout = Wait.value(); + + for (Command command : commands) { + CommandTimeoutVO commandTimeoutVo = commandTimeoutDao.findByCommandClasspath(command.getClass().getName()); + + if (commandTimeoutVo != null && commandTimeoutVo.getTimeout() > timeout) { + timeout = commandTimeoutVo.getTimeout(); + } + } + + if (timeout <= 0) { + timeout = Wait.value(); + } Review Comment: new method? ########## engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java: ########## @@ -224,6 +225,7 @@ public DatabaseUpgradeChecker() { .next("4.17.2.0", new Upgrade41720to41800()) .next("4.18.0.0", new Upgrade41800to41810()) .next("4.18.1.0", new Upgrade41810to41900()) + .next("4.19.0.0", new Upgrade41900to41910()) Review Comment: Do you intend for this to go in 4.19.1? it is now targetted at main. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
