transactd 3.4.1 → 3.5.0

data/source/bzs/netsvc/server/serverTpool.cpp

@@ -123,7 +123,7 @@ class connection : public boost::enable_shared_from_this<connection>,
 
                     boost::asio::write(m_socket, m_optionalBuffes,
                                        boost::asio::transfer_all(), e);
-                    if (e)
+                    if (e || ret == EXECUTE_RESULT_SEND_QUIT)
                         return false;
                 }
             }
@@ -153,7 +153,7 @@ class connection : public boost::enable_shared_from_this<connection>,
 
                 if (ret == EXECUTE_RESULT_QUIT)
                     return;
-                else if(ret == EXECUTE_RESULT_ACCESS_DNIED)
+                else if(ret == EXECUTE_RESULT_ACCESS_DNIED || ret == EXECUTE_RESULT_SEND_QUIT)
                 {
                     boost::asio::write(m_socket,  buffer(&m_result[0], size),
                            boost::asio::transfer_all());
@@ -167,9 +167,7 @@ class connection : public boost::enable_shared_from_this<connection>,
                     boost::system::error_code ec;
                     boost::asio::write(m_socket, m_optionalBuffes,
                                        boost::asio::transfer_all(), ec);
-                    if (ec)
-                        return;
-                    syncReadWrite();
+                    if (ec || !syncReadWrite()) return;
                 }
                 DEBUG_PROFILE_START(1)
                 async_write(m_socket, m_optionalBuffes,

data/source/bzs/test/tdclatl/test_v3.js

@@ -316,6 +316,12 @@ function createFieldNames()
 {
 	return new ActiveXObject("transactd.fieldNames");
 }
+/*--------------------------------------------------------------------------------*/
+function createHaNameResolver()
+{
+	return new ActiveXObject("transactd.haNameResolver");
+}
+
 /*--------------------------------------------------------------------------------*/
 var sep = "-------------------------------------------------------------------------------";
 var FMT_LEFT = 0;
@@ -702,6 +708,9 @@ function testBinlogPos(db)
 		checkNotEqual(bpos.filename, "",  "bpos.filename");
 		WScript.Echo("\nBinlog pos = " + bpos.filename + ":" + bpos.pos);
 		WScript.Echo("Binlog gtid = " + bpos.gtid);
+		bpos.gtid = "abcd";
+		checkEqual(bpos.gtid, "abcd",  "bpos.setGtid");
+
 	}
 	db.endSnapshot();
 }
@@ -727,7 +736,7 @@ function testConnMgr(uri)
 	checkEqual(recs.size , 1, "mgr.Connections.size");
 	checkEqual(recs1.size , 1, "mgr.InUseDatabases.size");
 	checkEqual(recs2.size , 4, "mgr.InUseTables.size");
-	
+
 	//tables
 	recs =  mgr.tables("test_v3");
 	checkEqual(mgr.stat , 0,  "mgr.tables");
@@ -761,17 +770,96 @@ function testConnMgr(uri)
 	recs = mgr.statusvars();
 	checkEqual(mgr.stat , 0,  "mgr.statusvars");
 	checkEqual(mgr.statusvarName(0) , "tcp_connections",  "mgr.statusvarName");
-	
 	//slaveStatus
-	recs = mgr.slaveStatus();
+	recs = mgr.slaveStatus("");
 	checkEqual(mgr.stat , 0,  "mgr.slaveStatus");
 	checkEqual(mgr.slaveStatusName(0) , "Slave_IO_State",  "mgr.slaveStatusName");
 	var status = "";
 	for (var i = 0; i<recs.size; ++i)
 	   status += (mgr.slaveStatusName(i) + "\t:" + recs(i).value + "\n");
+	//Extendedvars
+	recs = mgr.extendedvars();
+	checkEqual(recs.size, 4,  "extendedvars size");
+	checkEqual(mgr.extendedVarName(0) , "MySQL_Gtid_Mode",  "mgr.extendedVarName");
+
+	//slaveHosts
+	recs = mgr.slaveHosts();
+	checkEqual(mgr.stat , 0,  "mgr.slaveHosts");
+
+	//channels
+	recs = mgr.channels();
+	checkEqual(mgr.stat , 0,  "mgr.channels");
+	
+	//haLock
+	var ret = mgr.haLock();
+	checkEqual(mgr.stat , 0,  "mgr.haLock");
+	checkEqual(ret , true,  "mgr.haLock");
+		
+	//haUnlock
+	mgr.haUnlock();
+	checkEqual(mgr.stat , 0,  "mgr.haUnlock");
+
+	//setRole
+	ret = mgr.setRole(0);
+	checkEqual(mgr.stat , 0,  "mgr.setRole");
+	checkEqual(ret , true,  "mgr.setRole");
+
+	ret = mgr.setRole(1);
+	checkEqual(mgr.stat , 0,  "mgr.setRole");
+	checkEqual(ret , true,  "mgr.setRole");
 	
+	//setEnableFailover
+	ret = mgr.setEnableFailover(false);
+	checkEqual(mgr.stat , 0,  "mgr.setEnableFailover");
+	checkEqual(ret , true,  "mgr.setEnableFailover");
+	ret = mgr.setEnableFailover(true);
+	checkEqual(mgr.stat , 0,  "mgr.setEnableFailover");
+	checkEqual(ret , true,  "mgr.setEnableFailover");
+	checkEqual(mgr.isOpen , true,  "mgr.isOpen");
+
+	//enableAutoReconnect
+	checkEqual(db.enableAutoReconnect, false,  "db.enableAutoReconnect");
+	db.enableAutoReconnect = true;
+	checkEqual(db.enableAutoReconnect, true,  "db.enableAutoReconnect2");
+	db.enableAutoReconnect = false;
 	mgr.disconnect();
 	checkEqual(mgr.stat , 0,  "mgr.disconnect");
+	checkEqual(mgr.isOpen , false,  "mgr.isOpen");
+
+	//haNameReslover
+	var hnr = createHaNameResolver();
+	var host = "localhost";
+	var user = "root";
+	var pwd = "";
+	if (WScript.arguments.length > 1)
+		host = WScript.arguments(1);
+	if (WScript.arguments.length > 2)
+		user = WScript.arguments(2);
+	if (WScript.arguments.length > 3)
+		pwd = WScript.arguments(3);
+
+	var ret = hnr.start("master123", "slave1, slave2", host, 0, user, pwd);
+	checkEqual(ret , 1,  "hnr.start");
+	
+	//portMap
+	hnr.addPortMap(3307, 8611);
+	hnr.clearPortMap();
+	
+	//master slave name
+	checkEqual(hnr.master , host,  "hnr.master");
+	checkEqual(hnr.slave , "-",  "hnr.slave");
+
+	//connect by master roll
+	mgr.connect("tdap://" + user + "@master123/?pwd=" + pwd);
+	checkEqual(db.stat , 0,  "mgr.connect hnr");
+	checkEqual(mgr.isOpen , true,  "mgr.isOpen");
+	mgr.disconnect();
+	
+	//stop 
+	hnr.stop();
+	mgr.connect("tdap://" + user + "@master123/?pwd=" + pwd);
+	checkEqual(db.stat , ERROR_TD_HOSTNAME_NOT_FOUND,  "mgr.connect hnr");
+
 	WScript.Echo("\n\n" + status);
 }
 

data/source/bzs/test/tdclphp/transactd_v3_Test.php

@@ -768,7 +768,13 @@ class transactdTest extends PHPUnit_Framework_TestCase
         }
         $this->assertNotEquals($bpos->pos, 0);
         $this->assertNotEquals($bpos->filename, "");
-        //echo PHP_EOL.'binlog pos = '.$bpos->filename.':'.$bpos->pos.PHP_EOL;
+        echo PHP_EOL.'binlog pos = '.$bpos->filename.':'.$bpos->pos.PHP_EOL;
+        echo 'gtid (set)= '.$bpos->gtid.PHP_EOL;;
+        
+        //setGtid
+        $bpos->gtid = "ABCD";
+        $this->assertEquals($bpos->gtid , "ABCD");
+        
         $db->endSnapshot();
         $db->close();
     }
@@ -861,16 +867,96 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($mgr->stat(), 0);
         $this->assertEquals(bz\connMgr::statusvarName(0), "tcp_connections");
         //slaveStatus
-        $recs = $mgr->slaveStatus();
+        $recs = $mgr->slaveStatus("");
         $this->assertEquals($mgr->stat(), 0);
         $this->assertEquals($mgr->slaveStatusName(0), "Slave_IO_State");
         for ($i = 0; $i < $recs->size(); $i++)
         {
             echo(PHP_EOL . $mgr->slaveStatusName($i) . "\t:" . $recs[$i]->value);
         }
+        
+        //extendedvars
+        $recs = $mgr->extendedvars();
+        $this->assertEquals($recs->size(), 4);
+        $this->assertEquals($mgr->extendedVarName(0) , "MySQL_Gtid_Mode");
+        
+        // record port
+        $this->assertEquals($recs[0]->port , 0);
+        
+        //slaveHosts
+        $recs = $mgr->slaveHosts();
+        $this->assertEquals($mgr->stat() , 0);
+        //channels
+        $recs = $mgr->channels();
+        $this->assertEquals($mgr->stat() , 0);
+        //haLock
+        $ret = $mgr->haLock();
+        $this->assertEquals($mgr->stat() , 0);
+        $this->assertEquals($ret , true);
+        //haUnlock
+        $mgr->haUnlock();
+        $this->assertEquals($mgr->stat() , 0);
+        //setRole
+        $ret = $mgr->setRole(0);
+        $this->assertEquals($mgr->stat() , 0);
+        $this->assertEquals($ret , true);
+        $ret = $mgr->setRole(1);
+        $this->assertEquals($mgr->stat() , 0);
+        $this->assertEquals($ret , true);
+        //setEnableFailover
+        $ret = $mgr->setEnableFailover(false);
+        $this->assertEquals($mgr->stat() , 0);
+        $this->assertEquals($ret , true);
+        $ret = $mgr->setEnableFailover(true);
+        $this->assertEquals($mgr->stat() , 0);
+        $this->assertEquals($ret , true);
+        $this->assertEquals($mgr->isOpen() , true);
+        //enableAutoReconnect
+        $this->assertEquals($db->enableAutoReconnect(), false);
+        $db->setenableAutoReconnect(true);
+        $this->assertEquals($db->enableAutoReconnect(), true);
+        $db->setenableAutoReconnect(false);
         $mgr->disconnect();
-        $this->assertEquals($mgr->stat(), 0);
+        $this->assertEquals($mgr->stat() , 0);
+        $this->assertEquals($mgr->isOpen(), false);
+        //haNameReslover
+        $host = "localhost";
+        $user = "root";
+        $pwd = "";
+        $ret = bz\haNameResolver::start("master123", "slave1, slave2", $host, 0, $user, $pwd);
+        $this->assertEquals($ret , 1);
+        //portMap
+        bz\haNameResolver::addPortMap(3307, 8611);
+        bz\haNameResolver::clearPortMap();
+        //master slave name
+        $this->assertEquals(bz\haNameResolver::master() , $host);
+        $this->assertEquals(bz\haNameResolver::slave() , "-");
+        //connect by master roll
+        $mgr->connect("tdap://" . $user . "@master123/?pwd=" . $pwd);
+        $this->assertEquals($mgr->stat() , 0);
+        $this->assertEquals($mgr->isOpen() , true);
+        $mgr->disconnect();
+        $this->assertEquals($mgr->isOpen() , false);
+        //stop 
+        bz\haNameResolver::stop();
+        $mgr->connect("tdap://" . $user . "@master123/?pwd=" . $pwd);
+        $this->assertEquals($mgr->stat() , ERROR_TD_HOSTNAME_NOT_FOUND);
         $tb_other->close();
         $db_other->close();
+        
     }
+    
+    public function test_v3_5_constant()
+    {
+        $this->assertEquals(bz\transactd::ERROR_TD_RECONNECTED_OFFSET , 1000);
+        $this->assertEquals(bz\transactd::ERROR_TD_INVALID_SERVER_ROLE , 3812);
+        $this->assertEquals(bz\transactd::ERROR_TD_RECONNECTED , 3900);
+        $this->assertEquals(bz\transactd::MYSQL_ERROR_OFFSET , 25000);
+        $this->assertEquals(bz\transactd::HA_ROLE_SLAVE , 0);
+        $this->assertEquals(bz\transactd::HA_ROLE_MASTER , 1);
+        $this->assertEquals(bz\transactd::HA_ROLE_NONE , 2);
+        $this->assertEquals(bz\transactd::HA_RESTORE_ROLE , 4);
+        $this->assertEquals(bz\transactd::HA_ENABLE_FAILOVER , 8);
+    }
+
 }

data/source/bzs/test/tdclrb/transactd_v3_spec.rb

@@ -773,6 +773,10 @@ describe Transactd, 'V3Features' do
     expect(bpos.pos).not_to eq  0
     expect(bpos.filename).not_to eq ""
     print "\nbinlog pos = ", bpos.filename, ":", bpos.pos, "\n"
+    print "gtid (set)= ", bpos.gtid, "\n"
+    # setGtid
+    bpos.gtid = "ABCD"
+    expect(bpos.gtid).to eq "ABCD"
     db.endSnapshot();
     db.close()
   end
@@ -854,15 +858,78 @@ describe Transactd, 'V3Features' do
     expect(mgr.stat()).to eq 0
     expect(Transactd::ConnMgr::statusvarName(0)).to eq "tcp_connections"
     # slaveStatus
-    recs = mgr.slaveStatus()
+    recs = mgr.slaveStatus("")
     expect(mgr.stat()).to eq 0
     expect(mgr.slaveStatusName(0)).to eq "Slave_IO_State"
-
     for i in 0...recs.size() do
       puts (mgr.slaveStatusName(i) + "\t:" + recs[i].value.to_s)
     end
+    # extendedvars
+    recs = mgr.extendedvars()
+    expect(recs.size()).to eq 4
+    expect(Transactd::ConnMgr::extendedVarName(0)).to eq "MySQL_Gtid_Mode"
+    # record port
+    expect(recs[0].port).to eq 0
+    # slaveHosts
+    recs = mgr.slaveHosts()
+    expect(mgr.stat()).to eq 0
+    # channels
+    recs = mgr.channels()
+    expect(mgr.stat()).to eq 0
+    # haLock
+    ret = mgr.haLock()
+    expect(mgr.stat()).to eq 0
+    expect(ret).to eq true
+    # haUnlock
+    mgr.haUnlock()
+    expect(mgr.stat()).to eq 0
+    # setRole
+    ret = mgr.setRole(0)
+    expect(mgr.stat()).to eq 0
+    expect(ret).to eq true
+    ret = mgr.setRole(1)
+    expect(mgr.stat()).to eq 0
+    expect(ret).to eq true
+    # setEnableFailover
+    ret = mgr.setEnableFailover(false)
+    expect(mgr.stat()).to eq 0
+    expect(ret).to eq true
+    ret = mgr.setEnableFailover(true)
+    expect(mgr.stat()).to eq 0
+    expect(ret).to eq true
+    expect(mgr.isOpen()).to eq true
+    # enableAutoReconnect
+    expect(Transactd::Database::enableAutoReconnect()).to eq false
+    Transactd::Database::setEnableAutoReconnect(true)
+    expect(Transactd::Database::enableAutoReconnect()).to eq true
+    Transactd::Database::setEnableAutoReconnect(false)
+    mgr.disconnect()
+    expect(mgr.stat()).to eq 0
+    expect(mgr.isOpen()).to eq false
+    # haNameReslover
+    host = "localhost"
+    user = "root"
+    pwd = ""
+    ret = Transactd::HaNameResolver::start("master123", "slave1, slave2", host, 0, user, pwd)
+    expect(ret).to eq 1
+    # portMap
+    Transactd::HaNameResolver::addPortMap(3307, 8611)
+    Transactd::HaNameResolver::clearPortMap()
+    # master slave name
+    expect(Transactd::HaNameResolver::master()).to eq host
+    expect(Transactd::HaNameResolver::slave()).to eq "-"
+    # connect by master roll
+    mgr.connect("tdap://" + user + "@master123/?pwd=" + pwd)
+    expect(mgr.stat()).to eq 0
+    expect(mgr.isOpen()).to eq true
     mgr.disconnect()
     expect(mgr.stat()).to eq 0
+    expect(mgr.isOpen()).to eq false
+    # stop 
+    Transactd::HaNameResolver::stop()
+    mgr.connect("tdap://" + user + "@master123/?pwd=" + pwd)
+    expect(mgr.stat()).to eq Transactd::ERROR_TD_HOSTNAME_NOT_FOUND
+    mgr.disconnect()
     tb_other.close()
     db_other.close()
   end

data/source/bzs/test/trdclengn/testField.h

@@ -3346,7 +3346,7 @@ void testSnapshotWithbinlog()
 }
 
 
-void testTableList()
+void testConnMgr()
 {
     nsdatabase::setCheckTablePtr(true);
     database_ptr db = createDatabaseObject();
@@ -3372,8 +3372,26 @@ void testTableList()
     }
     {
         mgr->slaveStatus();
+        BOOST_CHECK_MESSAGE(mgr->stat() == 0, "stat = " << mgr->stat());
+    }
+    {
+        const connMgr::records& recs = mgr->extendedvars();
+        BOOST_CHECK(mgr->stat() == 0);
+        BOOST_CHECK(recs.size() == TD_EXTENDED_VAR_SIZE);
+        _tprintf(_T("\nSQL_GTID_MODE = %lld\n"), 
+            recs[TD_EXTENDED_VAR_MYSQL_GTID_MODE].longValue);
+    }
+    {
+        const connMgr::records& recs = mgr->slaveHosts();
         BOOST_CHECK(mgr->stat() == 0);
+        for (int i=0;i<recs.size();++i)
+        {
+            _TCHAR tmp[1024];
+            recs[i].value(tmp, 1024);
+            _tprintf(_T("slaveHosts = %u\t%u\t%s\n"), recs[i].id, recs[i].readCount, tmp);
+        }
     }
+
     mgr->disconnect();
 
 }

data/source/bzs/test/trdclengn/test_tdclcpp_ha.cpp

@@ -0,0 +1,388 @@
+/* =================================================================
+ Copyright (C) 2015 BizStation Corp All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ ================================================================= */
+#include "testbase.h"
+#include <bzs/db/protocol/tdap/btrDate.h>
+#include <bzs/db/protocol/tdap/client/connMgr.h>
+#include <bzs/db/protocol/tdap/client/haNameResolver.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <global/replication/haCommand.h>
+#pragma package(smart_init)
+
+#define DBNAMEV3 _T("test_v3")
+
+char host1[128] = {"localhost"};
+char host2[128] = {"localhost:8611"};
+char host3[128] = {"localhost:8612"};
+char g_repUser[128] = "replication_user";
+char g_repPasswd[128] = "abcd";
+
+char slaveHostsWithPort[512];
+static const char* portMap = "8610:3306,8611:3307,8612:3308";
+
+/* command line ex
+
+./test_tdclcpp_ha_64m --host1=HOST --host2=HOST:8611 --host3=HOST2 --repl_user=replication_user --repl_passwd=abcd
+
+*/
+void init_commandLine(char* argv)
+{
+    if (strstr(argv, "--host1=") == argv)
+        strcpy_s(host1, 128, (argv + 8)); 
+    if (strstr(argv, "--host2=") == argv)
+        strcpy_s(host2, 128, (argv + 8)); 
+    if (strstr(argv, "--host3=") == argv)
+        strcpy_s(host3, 128, (argv + 8)); 
+    if (strstr(argv, "--repl_user=") == argv)
+        strcpy_s(g_repUser, 128, (argv + 12)); 
+    if (strstr(argv, "--repl_passwd=") == argv)
+        strcpy_s(g_repPasswd, 128, (argv + 14)); 
+}
+
+_tstring str_conv(const char* v)
+{
+#ifdef _UNICODE
+    wchar_t wbuf[1024];
+    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, v, -1, wbuf, 1024);
+    return wbuf;
+#else
+    return v;
+#endif //_UNICODE
+}
+
+const char* getHostList()
+{
+    sprintf_s(slaveHostsWithPort, 512, "%s,%s,%s", host1, host2, host3);
+    return slaveHostsWithPort;
+}
+
+const char* g_port[3] = {"3306", "3307", "3308"};
+const char* getReplPort(const _tstring& host)
+{
+    _TCHAR tmp[128];
+    _tcscpy_s(tmp ,128, host.c_str());
+    int n = 0;
+    const _TCHAR* p = _tcsstr(tmp, _T(":"));
+    if (p)
+        n = _ttol(p+1) - 8610;
+    return g_port[n];    
+}
+
+void start_Resolver()
+{
+    const char* slaves = "slave1,slave2";
+    const char* slaveHostsWithPort = getHostList();
+    haNameResolver::addPortMap(3307, 8611);
+    haNameResolver::addPortMap(3308, 8612);
+    string u = toUtf8(g_userName);
+    string p = toUtf8(g_password);
+    int ret = haNameResolver::start("master", slaves, slaveHostsWithPort, 1, u.c_str(), p.c_str());
+    BOOST_CHECK_MESSAGE(ret == 0, "startResolver ret = " << ret);
+}
+
+void testSetServerRole()
+{
+    failOverParam pm;
+    pm.master.host = str_conv(host1);
+    pm.master.user = g_userName;
+    pm.master.passwd = g_password;
+    try
+    {
+        setServerRole(pm, HA_ROLE_MASTER);
+        BOOST_CHECK(true);
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        BOOST_CHECK_MESSAGE(false, "setServerRole Error");
+        _tprintf(_T("%s"), getMsg(e)->c_str());
+    }
+}
+
+void testNameResover()
+{
+    start_Resolver();
+    BOOST_CHECK_MESSAGE(std::string(haNameResolver::slave()) == host2, haNameResolver::slave());
+    BOOST_CHECK_MESSAGE(std::string(haNameResolver::master()) == host1, haNameResolver::master());
+
+    database_ptr db = createDatabaseObject();
+    bool ret = db->open(makeUri(PROTOCOL, _T("master"), DBNAMEV3, BDFNAME));
+    BOOST_CHECK(ret == true);
+    table* tb = db->openTable(_T("fieldtest"));
+    BOOST_CHECK(db->stat() == 0);
+    tb->seekFirst();
+    tb->setFV(_T("int_1_byte"), 1);
+    tb->update();
+    BOOST_CHECK(tb->stat() == 0);
+    db->close();
+    ret = db->open(makeUri(PROTOCOL, _T("slave1"), DBNAMEV3, BDFNAME));
+    BOOST_CHECK(ret == true);
+    db->close();
+
+    //haNameResolver::clear();
+    //BOOST_CHECK(std::string(haNameResolver::slave()) == "");
+    //BOOST_CHECK(std::string(haNameResolver::master()) == "");
+    haNameResolver::stop();
+    ret = db->open(makeUri(PROTOCOL, _T("master"), DBNAMEV3, BDFNAME));
+    BOOST_CHECK(ret == false);
+}
+
+void makeSOParam(failOverParam& pm, const _tstring& master, const _tstring& newMaster)
+{
+    pm.master.host = master;
+    pm.master.user = g_userName;
+    pm.master.passwd = g_password;
+    pm.newMaster.host = newMaster;
+    pm.newMaster.repPort = getReplPort(newMaster);
+    pm.newMaster.repUser = g_repUser;
+    pm.newMaster.repPasswd = g_repPasswd;
+}
+
+void testSwitchTo(const _tstring& master, const _tstring& newMaster)
+{ 
+    try
+    {
+        haNameResolver::stop();
+        failOverParam pm;
+        pm.option |= OPT_SO_AUTO_SLVAE_LIST;
+        makeSOParam(pm,master, newMaster);
+        switchOrver(pm);
+        BOOST_CHECK(true);
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(false);
+        _tprintf(_T("%s"), getMsg(e)->c_str());
+    }
+}
+
+void testNameResover8611()
+{
+    start_Resolver();
+    bool ret = std::string(haNameResolver::slave()) == host1 || std::string(haNameResolver::slave()) == host3;
+    BOOST_CHECK_MESSAGE(ret == true, haNameResolver::slave());
+    BOOST_CHECK_MESSAGE(std::string(haNameResolver::master()) == host2, haNameResolver::master());
+    database_ptr db = createDatabaseObject();
+    ret = db->open(makeUri(PROTOCOL, _T("master"), DBNAMEV3, BDFNAME));
+    BOOST_CHECK(ret == true);
+    db->close();
+    ret = db->open(makeUri(PROTOCOL, _T("slave1"), DBNAMEV3, BDFNAME));
+    BOOST_CHECK(ret == true);
+    db->close();
+
+    //haNameResolver::clear();
+    //BOOST_CHECK(std::string(haNameResolver::slave()) == "");
+    //BOOST_CHECK(std::string(haNameResolver::master()) == "");
+    haNameResolver::stop();
+    ret = db->open(makeUri(PROTOCOL, _T("master"), DBNAMEV3, BDFNAME));
+    BOOST_CHECK(ret == false);
+}
+
+void testSwitchLiveSeek()
+{
+    database_ptr db = createDatabaseObject();
+    try
+    {
+        start_Resolver();
+        bool ret = db->open(makeUri(PROTOCOL, _T("master"), DBNAMEV3, BDFNAME));
+        BOOST_CHECK(db->stat() == 0);
+        if (ret)
+        {
+            table* tb = db->openTable(_T("fieldtest"));
+            BOOST_CHECK(db->stat() == 0);
+            table* tb2 = db->openTable(_T("timetest"));
+            BOOST_CHECK(db->stat() == 0);
+            if (tb && tb2)
+            {
+                tb->seekFirst();
+                tb2->seekFirst();
+                failOverParam pm;
+                pm.option |= OPT_SO_AUTO_SLVAE_LIST;
+                makeSOParam(pm, str_conv(host2), str_conv(host3));
+                switchOrver(pm);
+                BOOST_CHECK(true);
+
+                tb->seekNext();
+                BOOST_CHECK(tb->stat() == 0);
+                BOOST_CHECK(tb->getFVint(_T("id")) == 2);
+                tb2->seekNext();
+                BOOST_CHECK(tb2->stat() == 0);
+                BOOST_CHECK(tb2->getFVint(_T("id")) == 2);
+                tb->release();
+                tb2->release();
+            }
+        }
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(false);
+        _tprintf(_T("%s"), getMsg(e)->c_str());
+    }
+}
+
+void testSwitchLiveOpen()
+{
+    try
+    {
+        database_ptr db = createDatabaseObject();
+        start_Resolver();
+        failOverParam pm;
+        pm.option |= OPT_SO_AUTO_SLVAE_LIST;
+        makeSOParam(pm, str_conv(host3), str_conv(host1));
+        switchOrver(pm);
+        bool ret = db->open(makeUri(PROTOCOL, _T("master"), DBNAMEV3, BDFNAME));
+        BOOST_CHECK(ret && (db->stat() == 0));
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(false);
+        _tprintf(_T("%s"), getMsg(e)->c_str());
+    }
+}
+
+void testEnableFailOver(bool v)
+{
+    failOverParam pm;
+    pm.master.host = str_conv(host1);
+    pm.master.user = g_userName;
+    pm.master.passwd = g_password;
+    pm.option |= OPT_SO_AUTO_SLVAE_LIST;
+    try
+    {
+        setEnableFailOver(pm, v);        
+        BOOST_CHECK(true);
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        BOOST_CHECK_MESSAGE(false, "setEnableFailOver Error v = " << v);
+        _tprintf(_T("%s"), getMsg(e)->c_str());
+    }
+}
+
+void testFailOverBlock()
+{
+    database_ptr db = createDatabaseObject();
+    start_Resolver();
+    failOverParam pm;
+    pm.master.user = g_userName;
+    pm.master.passwd = g_password;
+    char tmp[512];
+    sprintf_s(tmp, 512, "%s,%s", host2, host3);
+    pm.slaves = str_conv(tmp);
+    pm.portMap = portMap;
+    try
+    {
+        failOrver(pm);
+        BOOST_CHECK_MESSAGE(false, "failorver not block");
+    }
+    catch (bzs::rtl::exception& /*e*/)
+    {
+        BOOST_CHECK(true);
+
+    }
+}
+
+void testFailOver8611()
+{
+    database_ptr db = createDatabaseObject();
+    start_Resolver();
+    failOverParam pm;
+    pm.master.user = g_userName;
+    pm.master.passwd = g_password;
+    char tmp[512];
+    sprintf_s(tmp, 512, "%s,%s", host2, host3);
+    pm.slaves = str_conv(tmp);
+    pm.portMap = portMap;
+    try
+    {
+        failOrver(pm);
+        bool ret = db->open(makeUri(PROTOCOL, _T("master"), DBNAMEV3, BDFNAME));
+        BOOST_CHECK(ret && db->stat() == 0);
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        BOOST_CHECK_MESSAGE(false, "fail orver");
+        _tprintf(_T("%s"), getMsg(e)->c_str());
+    }
+}
+
+void testMasterToSlave()
+{
+    database_ptr db = createDatabaseObject();
+    start_Resolver();
+    failOverParam pm;
+    makeSOParam(pm, str_conv(host1),  str_conv(host2));
+    try
+    {
+        demoteToSlave(pm);
+        bool ret = db->open(makeUri(PROTOCOL, _T("master"), DBNAMEV3, BDFNAME));
+        BOOST_CHECK(ret && db->stat() == 0);
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(false);
+        _tprintf(_T("%s"), getMsg(e)->c_str());
+    }
+
+}
+
+BOOST_AUTO_TEST_SUITE(ha_default)
+BOOST_AUTO_TEST_CASE(NameResover)
+{
+    testSetServerRole();
+    testNameResover();
+}
+BOOST_AUTO_TEST_SUITE_END()
+
+
+BOOST_AUTO_TEST_SUITE(SwitchOver)
+BOOST_AUTO_TEST_CASE(Switch8611)
+{
+    testSwitchTo(str_conv(host1), str_conv(host2));
+}
+
+BOOST_AUTO_TEST_CASE(NameResover8611)
+{
+    testNameResover8611();
+}
+
+BOOST_AUTO_TEST_CASE(Switch8612)
+{
+    testSwitchLiveSeek();
+}
+BOOST_AUTO_TEST_CASE(Switch8610)
+{
+    testSwitchLiveOpen();
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(FailOver)
+BOOST_AUTO_TEST_CASE(FailOver8611)
+{
+    testEnableFailOver(false);
+    testFailOverBlock();
+    testEnableFailOver(true);
+    Sleep(10000);
+    testFailOver8611();
+    testMasterToSlave();
+    testSwitchTo(str_conv(host2), str_conv(host1));
+}
+BOOST_AUTO_TEST_SUITE_END()
+
+// ------------------------------------------------------------------------