[acassen/keepalived] fe775c: Fix use of init_state after a reload

  Branch: refs/heads/master
  Home:   https://github.com/acassen/keepalived
  Commit: fe775ce1dc526e7ab8d97da72d64ca9b4a78311e
      https://github.com/acassen/keepalived/commit/fe775ce1dc526e7ab8d97da72d64ca9b4a78311e
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-16 (Sat, 16 Dec 2017)

  Changed paths:
    M keepalived/vrrp/vrrp_scheduler.c

  Log Message:
  -----------
  Fix use of init_state after a reload

Issue #627 identified that vrrp->init_state was being incorrectly
used in vrrp_fault(), since it is modified at a reload.

Instead of using init_state, we now use the configured priority
of the vrrp instance, so if the vrrp instance is the address owner
(priority 255) it will transition to master after leaving to fault
state, otherwise it transitions to backup.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: e0fc908b11c757887b0d399a5280099a302b8b28
      https://github.com/acassen/keepalived/commit/e0fc908b11c757887b0d399a5280099a302b8b28
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-16 (Sat, 16 Dec 2017)

  Changed paths:
    M keepalived/include/vrrp.h
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_data.c
    M keepalived/vrrp/vrrp_json.c
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_print.c

  Log Message:
  -----------
  Remove init_state from vrrp structure

init_state is no longer used, so remove it from the vrrp structure.

Since it has been included in keepalived SNMP, it is preserved
solely for reporting in SNMP requests.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: f37bc124919fa8ef9035e47718e71f10b2fda3ab
      https://github.com/acassen/keepalived/commit/f37bc124919fa8ef9035e47718e71f10b2fda3ab
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-16 (Sat, 16 Dec 2017)

  Changed paths:
    M keepalived/core/global_data.c
    M keepalived/core/global_parser.c
    M keepalived/include/vrrp.h
    M keepalived/include/vrrp_snmp.h
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_scheduler.c
    M keepalived/vrrp/vrrp_snmp.c
    M keepalived/vrrp/vrrp_sync.c

  Log Message:
  -----------
  Change conditional compilation _WITH_SNMP_KEEPALIVED_ to _WITH_SNMP_VRRP_

The functionality that the conditional compilation enabled was snmp vrrp
functionality, so make the name more relevant.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: abe113e5b1f155580b58fb2bdd760dc924fc5382
      https://github.com/acassen/keepalived/commit/abe113e5b1f155580b58fb2bdd760dc924fc5382
  Author: pqarmitage <[email protected]>
  Date:   2017-12-16 (Sat, 16 Dec 2017)

  Changed paths:
    M keepalived/core/global_data.c
    M keepalived/core/global_parser.c
    M keepalived/include/vrrp.h
    M keepalived/include/vrrp_snmp.h
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_data.c
    M keepalived/vrrp/vrrp_json.c
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_print.c
    M keepalived/vrrp/vrrp_scheduler.c
    M keepalived/vrrp/vrrp_snmp.c
    M keepalived/vrrp/vrrp_sync.c

  Log Message:
  -----------
  Merge pull request #721 from pqarmitage/fixes

Resolve inconsistent use of vrrp->init_state


Compare: https://github.com/acassen/keepalived/compare/bd7ccbafd2cc...abe113e5b1f1

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

_______________________________________________
Keepalived-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/keepalived-devel