cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From DaanHoogland <...@git.apache.org>
Subject [GitHub] cloudstack pull request: resolving a conflict due to reformatting
Date Sun, 17 Jan 2016 19:07:34 GMT
GitHub user DaanHoogland opened a pull request:

    https://github.com/apache/cloudstack/pull/1344

    resolving a conflict due to reformatting

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/DaanHoogland/cloudstack master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cloudstack/pull/1344.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1344
    
----
commit 7988f51ac07782ad9b9873c32438fd7cdb24edba
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Date:   2015-12-17T13:20:59Z

    CLOUDSTACK-9154 - Returns the guest iterface that is marked as added
    
       - Force a restart of keepalived if conntrackd is not running or configuration has changed

commit 749ac2e2242d8af9f05977951dd1b4855c1f6f08
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Date:   2015-12-18T09:37:13Z

    CLOUDSTACK-9154 - Adds test to cover nics state after GC

commit b1e421068280fe0acc427baf3e9f07dd2d610803
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Date:   2015-12-18T17:32:29Z

    CLOUDSTACK-9187 - Adds test to cover multiple nics and nic removal

commit c99d6f18c9fccdc44698a30af1b20701a2e85df4
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Date:   2015-12-18T17:36:02Z

    CLOUDSTACK-9187 - Fixes interface allocation to VRRP instances

commit 2aab4c142d47b77e7bbc584927a80b8ba180934e
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Date:   2015-12-18T18:56:06Z

    CLOUDSTACK-9188 -  Reads network GC interval and wait from configDao

commit f5a6dee8dd6b89ef954d39b4ade91f8f898cc026
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Date:   2015-12-18T19:18:24Z

    CLOUDSTACK-9187 - Makes code ready for more something like ethXXXX, if we ever get that
far
    
       - Adds log info to NetworkOrchestrator in order to make the work of the Net-Scavenger
more visible.

commit 5ef3144fdf65922a3da99357c6f90f3811b231d8
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Date:   2015-12-19T10:21:18Z

    CLOUDSTACK-9154 - Sets the pub interface down when all guest nets are gone
    
       - Refactors the set_backup, set_master and set_fault methods to have better names for
the variable
       - Increase the sleep on the test in order to wait for the routers to be ready. It's
now 3 times the GC settings

commit ff89587fd119b1cad543d8e96f0c428e41c35840
Author: Remi Bergsma <github@remi.nl>
Date:   2016-01-17T18:12:42Z

    Merge pull request #1277 from ekholabs/fix/4.7-rvpc-net-gc-CLOUDSTACK-9154
    
    [4.7] Critical VPCVR issues fixed: CLOUDSTACK-9154; CLOUDSTACK-9187; and CLOUDSTACK-9188This
PR applies the same fixes as in the PR #1259, but against branch 4.7.
    
    Please refer to PR #1259 for the tests results and all the comments already made there.
    
    Issues fixed are:
    
    * CLOUDSTACK-9154: rVPC doesn't recover from cleaning up of network garbage collector
    * CLOUDSTACK-9187: rVPC routers in Master/Master due to concurrency problem when writing
the keepalivd.conf
    * CLOUDSTACK-9188: NetworkGarbageCollector is not using gc.interval and gc.wait from settings
    
    Those changes have been covered by 2 new tests added to ```smoke/test_vpc_redundant.py```:
    
    * test_04_rvpc_network_garbage_collector_nics
    * test_05_rvpc_multi_tiers
    
    The test ```test_04_rvpc_network_garbage_collector_nics``` depends on the global settings
for the network.gc.interval and gc.wait. If one wants the test to run quicker, please change
the settings (default is 600 seconds for each) and restart the Management Server before running
the tests. I would suggest to set it to 60 seconds.
    
    In addition, the NetworkGarbageCollector was redefining the settings above mentioned and
not reading their values through ConfigDao. Due to that, the settings were not being applied
properly and the test was waiting to long to check the VPC routers.
    
    * pr/1277:
      CLOUDSTACK-9154 - Sets the pub interface down when all guest nets are gone
      CLOUDSTACK-9187 - Makes code ready for more something like ethXXXX, if we ever get that
far
      CLOUDSTACK-9188 -  Reads network GC interval and wait from configDao
      CLOUDSTACK-9187 - Fixes interface allocation to VRRP instances
      CLOUDSTACK-9187 - Adds test to cover multiple nics and nic removal
      CLOUDSTACK-9154 - Adds test to cover nics state after GC
      CLOUDSTACK-9154 - Returns the guest iterface that is marked as added
    
    Signed-off-by: Remi Bergsma <github@remi.nl>

commit addb26455ac73f5da3d07b8764980b1e012721c3
Author: Daan Hoogland <daan@onecht.net>
Date:   2016-01-17T19:04:11Z

    Merge release branch 4.7 to master
    
    * 4.7:
      CLOUDSTACK-9154 - Sets the pub interface down when all guest nets are gone
      CLOUDSTACK-9187 - Makes code ready for more something like ethXXXX, if we ever get that
far
      CLOUDSTACK-9188 -  Reads network GC interval and wait from configDao
      CLOUDSTACK-9187 - Fixes interface allocation to VRRP instances
      CLOUDSTACK-9187 - Adds test to cover multiple nics and nic removal
      CLOUDSTACK-9154 - Adds test to cover nics state after GC
      CLOUDSTACK-9154 - Returns the guest iterface that is marked as added
    
     Conflicts:
    	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message