You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2019/12/19 09:28:00 UTC
[GitHub] [cloudstack] mdominka opened a new pull request #3776: Fix ha
config keys
mdominka opened a new pull request #3776: Fix ha config keys
URL: https://github.com/apache/cloudstack/pull/3776
## Description
<!--- Describe your changes in detail -->
This pull request adds the missing configuration keys for the High Availability service for virtual machines. ([High-Availability_Developer_Guide](https://cwiki.apache.org/confluence/display/CLOUDSTACK/High+Availability+Developer%27s+Guide))
**Added keys (missing in the global configuration):**
time.between.cleanup
max.retries
time.to.sleep
time.between.failures
**Rename keys in the confluence document:**
ha.retry.wait -> restart.retry.interval
stop.retry.wait -> stop.retry.interval
workers -> ha.workers
<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. -->
<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->
## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] 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)
- [x] 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?
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to -->
<!-- see how your change affects other areas of the code, etc. -->
We tested it in production in our KVM environment.
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document -->
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573796102
@andrijapanicsb a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-567884545
@anuragaw a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] mdominka commented on a change in pull request #3776:
Fix HA config keys
Posted by GitBox <gi...@apache.org>.
mdominka commented on a change in pull request #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#discussion_r360818452
##########
File path: server/src/main/java/com/cloud/ha/dao/HighAvailabilityDao.java
##########
@@ -16,12 +16,12 @@
// under the License.
package com.cloud.ha.dao;
-import java.util.List;
-
Review comment:
I think thats happened during the merge. My IntelliJ sorts the imports differently, for whatever reason..
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] anuragaw commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
anuragaw commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-567972443
Travis failure was unrelated @mdominka . The tests that I've run are more exhaustive and should succeed in sometime.
Did you see unrelated files' changes ? Not something that's terrible but it's a matter of choice - personally I don't like having redundant noise in my PRs to keep clean git history by not committing unintended changes.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-568079770
<b>Trillian test result (tid-657)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33207 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3776-t657-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 76 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_04_rvpc_network_garbage_collector_nics | `Failure` | 299.63 | test_vpc_redundant.py
test_05_rvpc_multi_tiers | `Failure` | 429.21 | test_vpc_redundant.py
test_05_rvpc_multi_tiers | `Error` | 456.52 | test_vpc_redundant.py
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] svenvogel commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
svenvogel commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573418994
@DaanHoogland thanks for help. 👍 @mdominka will rebase it on 4.13 on monday. if its finished can you ensure that it will be ported to 4.14?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland edited a comment on issue #3776: Fix HA
config keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland edited a comment on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572625799
only 200 lines are changed and there are a lot of unneeded import statement moves in these files that would make porting difficult. If you want it on 4.13 as well
1. start with reverting those import changes in a new commit
1. and than `git rebase -i HEAD~12` on (a copy of) your branch.
1. I would say squash all changes.
1. than `git cherry-pick <the resulting commitish>` on a new branch of off 4.13
1. rename the new branch to `fix_ha_config_keys`
1. force it here by `git push mdominka fix_ha_config_keys --force`
1. change this PR to point to the other base branch.
hope this helps
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573795620
@blueorangutan package
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572138923
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573984096
<b>Trillian test result (tid-756)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 29236 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3776-t756-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 77 look OK, 0 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] svenvogel commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
svenvogel commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-568765025
@DaanHoogland for now its ready for 4.14. i think @mdominka dont have time to rebase it. it was his last work. we can move them back later. if its 4.13.1 we need an forward merge to 4.14?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573809811
@anuragaw a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573706211
@anuragaw It was still on master, while now being targetted at 4.13. all fine now
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] anuragaw commented on a change in pull request #3776:
Fix HA config keys
Posted by GitBox <gi...@apache.org>.
anuragaw commented on a change in pull request #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#discussion_r360311874
##########
File path: server/src/main/java/com/cloud/ha/dao/HighAvailabilityDaoImpl.java
##########
@@ -33,6 +26,11 @@
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
Review comment:
Same as above (optional though)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] mdominka commented on a change in pull request #3776:
Fix HA config keys
Posted by GitBox <gi...@apache.org>.
mdominka commented on a change in pull request #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#discussion_r360823981
##########
File path: api/src/main/java/com/cloud/resource/ResourceState.java
##########
@@ -16,12 +16,12 @@
// under the License.
package com.cloud.resource;
+import com.cloud.utils.fsm.StateMachine;
+
import java.util.Arrays;
import java.util.List;
import java.util.Set;
-import com.cloud.utils.fsm.StateMachine;
-
Review comment:
I think thats happened during the merge. My IntelliJ sorts the imports differently, for whatever reason..
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] svenvogel commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
svenvogel commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572201928
@DaanHoogland does we have the time to rebase it to 4.13.0.0 or we need to move it in 4.14.0.0?
@mdominka tried it but it seems not easy. @DaanHoogland if you can help us how to rebase it and ensure that it will be forward merged into 4.14.0.0? this is important for us.
can you tell us some git commands how to rebase it.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573806452
Packaging result: ✔centos6 ✔centos7 ✔debian. JID-582
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] anuragaw commented on a change in pull request #3776:
Fix HA config keys
Posted by GitBox <gi...@apache.org>.
anuragaw commented on a change in pull request #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#discussion_r360832376
##########
File path: api/src/main/java/com/cloud/resource/ResourceState.java
##########
@@ -16,12 +16,12 @@
// under the License.
package com.cloud.resource;
+import com.cloud.utils.fsm.StateMachine;
+
import java.util.Arrays;
import java.util.List;
import java.util.Set;
-import com.cloud.utils.fsm.StateMachine;
-
Review comment:
Yeah, happens with most of us. In case not done already, you can perhaps use the code style guideline from ACS page to configure them to community defined guidelines https://cwiki.apache.org/confluence/display/CLOUDSTACK/Coding+conventions (IntelliJ Idea section)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request
#3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#discussion_r359927558
##########
File path: server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java
##########
@@ -844,29 +851,25 @@ public boolean configure(final String name, final Map<String, Object> xmlParams)
value = params.get("force.ha");
_forceHA = Boolean.parseBoolean(value);
- value = params.get("time.to.sleep");
- _timeToSleep = (long)NumbersUtil.parseInt(value, 60) * 1000;
+ _timeToSleep = TimeToSleep.value() * SECONDS_TO_MILLISECONDS_FACTOR;
- value = params.get("max.retries");
- _maxRetries = NumbersUtil.parseInt(value, 5);
+ _maxRetries = MaxRetries.value();
- value = params.get("time.between.failures");
- _timeBetweenFailures = NumbersUtil.parseLong(value, 3600) * 1000;
+ _timeBetweenFailures = TimeBetweenFailures.value() * SECONDS_TO_MILLISECONDS_FACTOR;
- value = params.get("time.between.cleanup");
- _timeBetweenCleanups = NumbersUtil.parseLong(value, 3600 * 24);
+ _timeBetweenCleanups = TimeBetweenCleanup.value();
value = params.get("stop.retry.interval");
- _stopRetryInterval = NumbersUtil.parseInt(value, 10 * 60);
+ _stopRetryInterval = NumbersUtil.parseInt(value, STOP_RETRY_INTERVAL_SECONDS);
value = params.get("restart.retry.interval");
- _restartRetryInterval = NumbersUtil.parseInt(value, 10 * 60);
+ _restartRetryInterval = NumbersUtil.parseInt(value, RESTART_RETRY_INTERVAL_SECONDS);
value = params.get("investigate.retry.interval");
- _investigateRetryInterval = NumbersUtil.parseInt(value, 1 * 60);
+ _investigateRetryInterval = NumbersUtil.parseInt(value, INVESTIGATE_RETRY_INTERVAL_SECONDS);
value = params.get("migrate.retry.interval");
- _migrateRetryInterval = NumbersUtil.parseInt(value, 2 * 60);
+ _migrateRetryInterval = NumbersUtil.parseInt(value, MIGRATE_RETRY_INTERVAL_SECONDS);
Review comment:
and `time.between.cleanup`, `time.between.failures`, `max.retries` and `time.to.sleep`
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572139343
@andrijapanicsb a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] svenvogel commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
svenvogel commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572119535
@andrijapanicsb I can’t call additional test. For me looks good.
__
Sven Vogel
Teamlead Platform
EWERK DIGITAL GmbH
Brühl 24, D-04109 Leipzig
P +49 341 42649 - 99
F +49 341 42649 - 98
S.Vogel@ewerk.com
www.ewerk.com
Geschäftsführer:
Dr. Erik Wende, Hendrik Schubert, Frank Richter
Registergericht: Leipzig HRB 9065
Support:
+49 341 42649 555
Zertifiziert nach:
ISO/IEC 27001:2013
DIN EN ISO 9001:2015
DIN ISO/IEC 20000-1:2011
ISAE 3402 Typ II Assessed
EWERK-Blog<https://blog.ewerk.com/> | LinkedIn<https://www.linkedin.com/company/ewerk-group> | Xing<https://www.xing.com/company/ewerk> | Twitter<https://twitter.com/EWERK_Group> | Facebook<https://de-de.facebook.com/EWERK.IT/>
Mit Handelsregistereintragung vom 09.07.2019 ist die EWERK RZ GmbH auf die EWERK IT GmbH verschmolzen und firmiert nun gemeinsam unter dem Namen: EWERK DIGITAL GmbH, für weitere Informationen klicken Sie hier<https://www.ewerk.com/ewerkdigital>.
Auskünfte und Angebote per Mail sind freibleibend und unverbindlich.
Disclaimer Privacy:
Der Inhalt dieser E-Mail (einschließlich etwaiger beigefügter Dateien) ist vertraulich und nur für den Empfänger bestimmt. Sollten Sie nicht der bestimmungsgemäße Empfänger sein, ist Ihnen jegliche Offenlegung, Vervielfältigung, Weitergabe oder Nutzung des Inhalts untersagt. Bitte informieren Sie in diesem Fall unverzüglich den Absender und löschen Sie die E-Mail (einschließlich etwaiger beigefügter Dateien) von Ihrem System. Vielen Dank.
The contents of this e-mail (including any attachments) are confidential and may be legally privileged. If you are not the intended recipient of this e-mail, any disclosure, copying, distribution or use of its contents is strictly prohibited, and you should please notify the sender immediately and then delete it (including any attachments) from your system. Thank you.
Am 03.01.2020 um 22:41 schrieb Andrija Panic <no...@github.com>:
@blueorangutan<https://github.com/blueorangutan> package
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<https://github.com/apache/cloudstack/pull/3776?email_source=notifications&email_token=ABJOT5BPC542FN73G3VNEODQ36WGNA5CNFSM4J5AW6YKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEICEU3I#issuecomment-570706541>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ABJOT5GCGGDMKMJR7I4FOALQ36WGNANCNFSM4J5AW6YA>.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-568763964
I would prefer just one pr, so for 4.13.1 please rebase upon that branch.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572625799
only 200 lines are changed and there are a lot of unneeded import statement moves in these files that would make porting difficult. If you want it on 4.13 as well 1. start with reverting those import changes in a new commit
1. and than `git rebase -i HEAD~12` on (a copy of) your branch.
1. I would say squash all changes.
1. than `git cherry-pick <the resulting commitish>` on a new branch of off 4.13
1. rename the new branch to `fix_ha_config_keys`
1. force it here by `git push mdominka fix_ha_config_keys --force`
1. change this PR to point to the other base branch.
hope this helps
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572434722
@DaanHoogland can you please review briefly
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] mdominka commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
mdominka commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-567918671
One travis test failed, but i see no relation to my changes.
Can you test again @anuragaw
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-567876150
@anuragaw a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573555537
@mdominka @svenvogel any thing that goes on the 4.13 branch before 4.14 is released will be forward merged so it will be in master before 4.14 is cut. (A.K.A. don't worry™)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572335255
<b>Trillian test result (tid-728)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31217 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3776-t728-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 77 look OK, 0 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland edited a comment on issue #3776: Fix HA
config keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland edited a comment on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572625799
only 200 lines are changed and there are a lot of unneeded import statement moves in these files that would make porting difficult. If you want it on 4.13 as well 1. start with reverting those import changes in a new commit
1. and than `git rebase -i HEAD~12` on (a copy of) your branch.
1. I would say squash all changes.
1. than `git cherry-pick <the resulting commitish>` on a new branch of off 4.13
1. rename the new branch to `fix_ha_config_keys`
1. force it here by `git push mdominka fix_ha_config_keys --force`
1. change this PR to point to the other base branch.
hope this helps
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] anuragaw commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
anuragaw commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573809384
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] anuragaw commented on a change in pull request #3776:
Fix HA config keys
Posted by GitBox <gi...@apache.org>.
anuragaw commented on a change in pull request #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#discussion_r360310586
##########
File path: api/src/main/java/com/cloud/resource/ResourceState.java
##########
@@ -16,12 +16,12 @@
// under the License.
package com.cloud.resource;
+import com.cloud.utils.fsm.StateMachine;
+
import java.util.Arrays;
import java.util.List;
import java.util.Set;
-import com.cloud.utils.fsm.StateMachine;
-
Review comment:
nit- Unintended changes - in case we care about commit cleanliness (skip if not).
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572134538
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] anuragaw commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
anuragaw commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-567876130
@blueorangutan package
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] anuragaw commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
anuragaw commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-567884356
@mdominka - can you check if Travis Failures are related? I'll kick off tests in parallel.
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-567883759
Packaging result: ✖centos6 ✔centos7 ✔debian. JID-494
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] svenvogel commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
svenvogel commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-568736899
@DaanHoogland for me i would be good to get in 4.14 and sure in 4.13.1 too.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] anuragaw commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
anuragaw commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573671962
@svenvogel @mdominka - before rerunning tests may be we can do a quick rebase to resolve conflicts? There are merge conflicts.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] anuragaw commented on a change in pull request #3776:
Fix HA config keys
Posted by GitBox <gi...@apache.org>.
anuragaw commented on a change in pull request #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#discussion_r360311772
##########
File path: server/src/main/java/com/cloud/ha/dao/HighAvailabilityDao.java
##########
@@ -16,12 +16,12 @@
// under the License.
package com.cloud.ha.dao;
-import java.util.List;
-
Review comment:
Same as above
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland merged pull request #3776: Add missing HA
config keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland merged pull request #3776: Add missing HA config keys
URL: https://github.com/apache/cloudstack/pull/3776
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-567923074
@mdominka it is because we strain travis too much but it is unrelated to the tests @anuragaw is doing. The log was longer than travis allows and we've been getting those more and more lately.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-568700692
@svenvogel @andrijapanicsb do we not want this in for 4.13.1?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] andrijapanicsb removed a comment on issue #3776: Fix
HA config keys
Posted by GitBox <gi...@apache.org>.
andrijapanicsb removed a comment on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572134538
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] svenvogel commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
svenvogel commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572118023
@andrijapanicsb<https://github.com/andrijapanicsb> so we need additional test or can we merge it?
__
Sven Vogel
Teamlead Platform
EWERK DIGITAL GmbH
Brühl 24, D-04109 Leipzig
P +49 341 42649 - 99
F +49 341 42649 - 98
S.Vogel@ewerk.com
www.ewerk.com
Geschäftsführer:
Dr. Erik Wende, Hendrik Schubert, Frank Richter
Registergericht: Leipzig HRB 9065
Support:
+49 341 42649 555
Zertifiziert nach:
ISO/IEC 27001:2013
DIN EN ISO 9001:2015
DIN ISO/IEC 20000-1:2011
ISAE 3402 Typ II Assessed
EWERK-Blog<https://blog.ewerk.com/> | LinkedIn<https://www.linkedin.com/company/ewerk-group> | Xing<https://www.xing.com/company/ewerk> | Twitter<https://twitter.com/EWERK_Group> | Facebook<https://de-de.facebook.com/EWERK.IT/>
Mit Handelsregistereintragung vom 09.07.2019 ist die EWERK RZ GmbH auf die EWERK IT GmbH verschmolzen und firmiert nun gemeinsam unter dem Namen: EWERK DIGITAL GmbH, für weitere Informationen klicken Sie hier<https://www.ewerk.com/ewerkdigital>.
Auskünfte und Angebote per Mail sind freibleibend und unverbindlich.
Disclaimer Privacy:
Der Inhalt dieser E-Mail (einschließlich etwaiger beigefügter Dateien) ist vertraulich und nur für den Empfänger bestimmt. Sollten Sie nicht der bestimmungsgemäße Empfänger sein, ist Ihnen jegliche Offenlegung, Vervielfältigung, Weitergabe oder Nutzung des Inhalts untersagt. Bitte informieren Sie in diesem Fall unverzüglich den Absender und löschen Sie die E-Mail (einschließlich etwaiger beigefügter Dateien) von Ihrem System. Vielen Dank.
The contents of this e-mail (including any attachments) are confidential and may be legally privileged. If you are not the intended recipient of this e-mail, any disclosure, copying, distribution or use of its contents is strictly prohibited, and you should please notify the sender immediately and then delete it (including any attachments) from your system. Thank you.
Am 03.01.2020 um 22:41 schrieb Andrija Panic <no...@github.com>:
@blueorangutan<https://github.com/blueorangutan> package
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<https://github.com/apache/cloudstack/pull/3776?email_source=notifications&email_token=ABJOT5BPC542FN73G3VNEODQ36WGNA5CNFSM4J5AW6YKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEICEU3I#issuecomment-570706541>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ABJOT5GCGGDMKMJR7I4FOALQ36WGNANCNFSM4J5AW6YA>.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] svenvogel commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
svenvogel commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-573669474
>(A.K.A. don't worry™) 😄
@DaanHoogland here we go. can you check now?
@andrijapanicsb can you rerun the tests please?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] mdominka commented on issue #3776: Fix HA config keys
Posted by GitBox <gi...@apache.org>.
mdominka commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-572133643
when will it be merged?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-570501102
@svenvogel If we merge in a lower release and then fwd-merge there will be the same commitish for the same code and in the future it will be easier to find what fix went where. That is why i always ask for a rebase on the lowest branch. That said, if we can't we can't.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3776: Fix HA config
keys
Posted by GitBox <gi...@apache.org>.
andrijapanicsb commented on issue #3776: Fix HA config keys
URL: https://github.com/apache/cloudstack/pull/3776#issuecomment-570706541
@blueorangutan package
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services