server: Fix exception while update domain resource count (#3204)

[DaanHoogland]

reimplement #3303 on moved file in 4.12
(should add the fix from #3204 to master)

Description

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

[DaanHoogland]

@ustcweizhou , i redid your PR because it wouldn't fwd-merge.

[ustcweizhou]

@DaanHoogland ok. what about cherry-pick ?

[DaanHoogland]

@ustcweizhou same conflict, this was quicker

[yadvr]

@DaanHoogland you could have forward merged with this change?

[yadvr]

@DaanHoogland can you also check the Travis failure, is this breaking anything?

[yadvr]

@DaanHoogland @ustcweizhou the build fails due to:

/home/travis/build/apache/cloudstack/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java:270:9: expecting SEMI, found 'try'
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:3.0.0:check (cloudstack-checkstyle) on project cloud-engine-schema: Failed during checkstyle configuration: Exception was thrown while processing /home/travis/build/apache/cloudstack/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java: MismatchedTokenException occurred during the analysis of file /home/travis/build/apache/cloudstack/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java. expecting EOF, found 'pstmt' -> [Help 1]

Please hold merging until build is fixed, thanks.

[ustcweizhou]

@DaanHoogland you missed ";" at the end of line 269.

[DaanHoogland]

fixed

[DaanHoogland]

@rhtyd fwd-merge did not work due to the file being moved (out of git bounds)

[yadvr]

@blueorangutan package

[blueorangutan]

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

[blueorangutan]

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2751

[DaanHoogland]

@blueorangutan test

[blueorangutan]

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[DaanHoogland]

closing, setting git config global merge.renamelimit=5635 would have done the trick.

[blueorangutan]

Trillian test result (tid-3570)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32226 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3304-t3570-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Smoke tests completed. 70 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File