Merge pull request #589 from markruys/master
Fix some master/slave renaming issues
This commit is contained in:
commit
411fb8b2b6
1 changed files with 7 additions and 7 deletions
|
@ -2116,14 +2116,14 @@ sub get_replication_status {
|
|||
|
||||
infoprint "Semi synchronous replication Master: "
|
||||
. (
|
||||
defined( $myvar{'rpl_semi_sync_master_enabled'} )
|
||||
? $myvar{'rpl_semi_sync_master_enabled'}
|
||||
( defined( $myvar{'rpl_semi_sync_master_enabled'} ) or defined( $myvar{'rpl_semi_sync_source_enabled'} ) )
|
||||
? ( $myvar{'rpl_semi_sync_master_enabled'} || $myvar{'rpl_semi_sync_source_enabled'} )
|
||||
: 'Not Activated'
|
||||
);
|
||||
infoprint "Semi synchronous replication Slave: "
|
||||
. (
|
||||
defined( $myvar{'rpl_semi_sync_slave_enabled'} )
|
||||
? $myvar{'rpl_semi_sync_slave_enabled'}
|
||||
( defined( $myvar{'rpl_semi_sync_slave_enabled'} ) or defined( $myvar{'rpl_semi_sync_replica_enabled'} ) )
|
||||
? ( $myvar{'rpl_semi_sync_slave_enabled'} || $myvar{'rpl_semi_sync_replica_enabled'} )
|
||||
: 'Not Activated'
|
||||
);
|
||||
if ( scalar( keys %myrepl ) == 0 and scalar( keys %myslaves ) == 0 ) {
|
||||
|
@ -2137,11 +2137,11 @@ sub get_replication_status {
|
|||
}
|
||||
|
||||
$result{'Replication'}{'status'} = \%myrepl;
|
||||
my ($io_running) = $myrepl{'Slave_IO_Running'};
|
||||
my ($io_running) = $myrepl{'Slave_IO_Running'} || $myrepl{'Replica_IO_Running'};
|
||||
debugprint "IO RUNNING: $io_running ";
|
||||
my ($sql_running) = $myrepl{'Slave_SQL_Running'};
|
||||
my ($sql_running) = $myrepl{'Slave_SQL_Running'} || $myrepl{'Replica_SQL_Running'};
|
||||
debugprint "SQL RUNNING: $sql_running ";
|
||||
my ($seconds_behind_master) = $myrepl{'Seconds_Behind_Master'};
|
||||
my ($seconds_behind_master) = $myrepl{'Seconds_Behind_Master'} || $myrepl{'Seconds_Behind_Source'} ;
|
||||
debugprint "SECONDS : $seconds_behind_master ";
|
||||
|
||||
if ( defined($io_running)
|
||||
|
|
Loading…
Reference in a new issue