In c63dbb8804 I removed the rule from create-schema:
- `queue_proc_time` datetime COMMENT 'when processing started for the item',
But, upgrade path schema-40to410.sql had a different rule which caused the bug:
+ALTER TABLE `cloud`.`sync_queue_item` ADD `queue_proc_time` DATETIME NOT NULL
COMMENT 'when processing started for the item' AFTER `queue_proc_number`;
In this fix we just revert to whatever rule was defined in create-schema as the
developer may have forgetten to fix same rule in create-schema and upgrade path.
This commit can be reverted or the code be fixed if we want that queue_proc_time
cannot be null.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 4e72d84194cb79f5f067fbe4b2c874d36d2ae0e7)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
- Remove create-schema-view.sql, views are created when mgmt server does rolling
upgrade from 4.0.0 to 4.1.0
- Fix reference and usage of the sql file in scripts
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 31d6f03308)
Conflicts:
setup/db/create-schema-view.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
- Fix developer prefill to use 4.0's schema
- Fix developer/pom.xml and cloud-setup-databases to not run create-schema-view,
the upgrade path is configured to do a rolling update and set it up
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 16e81130cc)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
Changes:
- Use of class variable of type GenericSearchBuilder causes issues when multiple threads invoke this method to findCapacity
- Changing the scope of the variable to be local to these methods.
Detail: Per Kelven Yang when Javelin was merged into master/4.1, the memory
settings for management server should be a heap of 2g and a max perm size of
512m, due to increased footprint introduced by spring framework/Javelin.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361311099 -0700
Signed-off-by: Chip Childers <chip.childers@gmail.com>
Conflicts:
tools/whisker/LICENSE
tools/whisker/descriptor-for-packaging.xml
Also fixed the ordering for where we put java-ipv6.jar.
host name of router's resident host returned instead of the name of the
router. correcting the setter.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Non-printable characters results in empty pages for all users loading the
corrupted object in the web interface. It also results in the API call results
getting truncated with an error when it encounters the non-printable characters.
Every decoded parameter value is checked for control character using OWASP's
ESAPI library.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 87b668b71b)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db
Description: current package.sh fails if user hasn't downloaded all maven poms
prior to running package.sh. Now we match for something that vaguely resembles
a cloudstack version.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360889840 -0700
Detail: Removing references to /usr/lib/cloud and /usr/lib64/cloud so that old
systemvm.iso files aren't found by accident. systemvm.iso should exist in
/usr/share/cloudstack-common/vms now.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360860243 -0700