Commit 26a30a73 authored by joreland@mysql.com's avatar joreland@mysql.com

Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1-ndb
parents 51b696eb 94189cb4
...@@ -349,12 +349,15 @@ TransporterFacade::start_instance(const char * connectString){ ...@@ -349,12 +349,15 @@ TransporterFacade::start_instance(const char * connectString){
if(s_config_retriever->do_connect() == -1) if(s_config_retriever->do_connect() == -1)
break; break;
const Uint32 nodeId = s_config_retriever->allocNodeId(); Uint32 nodeId = s_config_retriever->allocNodeId();
for(Uint32 i = 0; nodeId == 0 && i<5; i++){
NdbSleep_SecSleep(3);
nodeId = s_config_retriever->allocNodeId();
}
if(nodeId == 0) if(nodeId == 0)
break; break;
ndb_mgm_configuration * props = s_config_retriever->getConfig(); ndb_mgm_configuration * props = s_config_retriever->getConfig();
if(props == 0) if(props == 0)
break; break;
......
...@@ -205,6 +205,11 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){ ...@@ -205,6 +205,11 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){
return NDBT_OK; return NDBT_OK;
} }
int runDropTable(NDBT_Context* ctx, NDBT_Step* step){
GETNDB(step)->getDictionary()->dropTable(ctx->getTab()->getName());
return NDBT_OK;
}
#include "bank/Bank.hpp" #include "bank/Bank.hpp"
int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){ int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){
...@@ -408,7 +413,7 @@ TESTCASE("BackupOne", ...@@ -408,7 +413,7 @@ TESTCASE("BackupOne",
INITIALIZER(runRestoreOne); INITIALIZER(runRestoreOne);
VERIFIER(runVerifyOne); VERIFIER(runVerifyOne);
FINALIZER(runClearTable); FINALIZER(runClearTable);
FINALIZER(runDropTable);
} }
TESTCASE("BackupBank", TESTCASE("BackupBank",
"Test that backup and restore works during transaction load\n" "Test that backup and restore works during transaction load\n"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
max-time: 1500 max-time: 1500
cmd: testIndex cmd: testIndex
args: -n CreateAll args: -n CreateAll T1 T6 T13
#-m 7200 1: testIndex -n InsertDeleteGentle T7 #-m 7200 1: testIndex -n InsertDeleteGentle T7
max-time: 3600 max-time: 3600
...@@ -20,12 +20,12 @@ args: -n CreateLoadDrop T1 T10 ...@@ -20,12 +20,12 @@ args: -n CreateLoadDrop T1 T10
# #
max-time: 600 max-time: 600
cmd: testBackup cmd: testBackup
args: -n BackupOne args: -n BackupOne T1 T6 T3 I3
max-time: 600
cmd: testBackup
args: -n BackupBank T6
#max-time: 600
#cmd: testBackup
#args: -n BackupBank T6
#
# #
# MGMAPI AND MGSRV # MGMAPI AND MGSRV
# #
......
...@@ -938,9 +938,11 @@ gather_result(atrt_config& config, int * result){ ...@@ -938,9 +938,11 @@ gather_result(atrt_config& config, int * result){
BaseString tmp = g_gather_progname; BaseString tmp = g_gather_progname;
for(size_t i = 0; i<config.m_processes.size(); i++){ for(size_t i = 0; i<config.m_processes.size(); i++){
atrt_process & proc = config.m_processes[i]; atrt_process & proc = config.m_processes[i];
tmp.appfmt(" %s:%s", if(proc.m_proc.m_path != ""){
proc.m_hostname.c_str(), tmp.appfmt(" %s:%s",
proc.m_proc.m_cwd.c_str()); proc.m_hostname.c_str(),
proc.m_proc.m_cwd.c_str());
}
} }
const int r1 = system(tmp.c_str()); const int r1 = system(tmp.c_str());
......
...@@ -70,11 +70,11 @@ NdbBackup::getFileSystemPathForNode(int _node_id){ ...@@ -70,11 +70,11 @@ NdbBackup::getFileSystemPathForNode(int _node_id){
* Fetch configuration from management server * Fetch configuration from management server
*/ */
ConfigRetriever cr(0, NODE_TYPE_API); ConfigRetriever cr(0, NODE_TYPE_API);
ndb_mgm_configuration * p; ndb_mgm_configuration * p = 0;
BaseString tmp; tmp.assfmt("%s:%d", host.c_str(), port); BaseString tmp; tmp.assfmt("%s:%d", host.c_str(), port);
NdbMgmHandle handle = ndb_mgm_create_handle(); NdbMgmHandle handle = ndb_mgm_create_handle();
if(handle == 0 || ndb_mgm_connect(handle, tmp.c_str()) != 0 && if(handle == 0 || ndb_mgm_connect(handle, tmp.c_str()) != 0 ||
(p = ndb_mgm_get_configuration(handle, 0)) == 0){ (p = ndb_mgm_get_configuration(handle, 0)) == 0){
const char * s = 0; const char * s = 0;
...@@ -97,7 +97,8 @@ NdbBackup::getFileSystemPathForNode(int _node_id){ ...@@ -97,7 +97,8 @@ NdbBackup::getFileSystemPathForNode(int _node_id){
ndbout << "Invalid configuration fetched, DB missing" << endl; ndbout << "Invalid configuration fetched, DB missing" << endl;
return NULL; return NULL;
} }
unsigned int type = 123456;
unsigned int type = NODE_TYPE_DB + 1;
if(iter.get(CFG_TYPE_OF_SECTION, &type) || type != NODE_TYPE_DB){ if(iter.get(CFG_TYPE_OF_SECTION, &type) || type != NODE_TYPE_DB){
ndbout <<"type = " << type << endl; ndbout <<"type = " << type << endl;
ndbout <<"Invalid configuration fetched, I'm wrong type of node" << endl; ndbout <<"Invalid configuration fetched, I'm wrong type of node" << endl;
...@@ -148,31 +149,18 @@ NdbBackup::execRestore(bool _restore_data, ...@@ -148,31 +149,18 @@ NdbBackup::execRestore(bool _restore_data,
ndbout << "res: " << res << endl; ndbout << "res: " << res << endl;
#if 0 snprintf(buf, 255, "%sndb_restore -c \"host=%s\" -n %d -b %d %s %s .",
snprintf(buf, 255, "ndb_restore -c \"nodeid=%d;host=%s\" -n %d -b %d %s %s %s/BACKUP/BACKUP-%d", #if 1
ownNodeId, "",
addr, #else
_node_id, "valgrind --leak-check=yes -v "
_backup_id,
_restore_data?"-r":"",
_restore_meta?"-m":"",
path,
_backup_id);
#endif #endif
snprintf(buf, 255, "valgrind --leak-check=yes -v ndb_restore -c \"nodeid=%d;host=%s\" -n %d -b %d %s %s .",
ownNodeId,
addr.c_str(), addr.c_str(),
_node_id, _node_id,
_backup_id, _backup_id,
_restore_data?"-r":"", _restore_data?"-r":"",
_restore_meta?"-m":""); _restore_meta?"-m":"");
// path,
// _backup_id);
ndbout << "buf: "<< buf <<endl; ndbout << "buf: "<< buf <<endl;
res = system(buf); res = system(buf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment