Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
94e65a83
Commit
94e65a83
authored
Jan 30, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents
f10eef04
061488ec
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
404 additions
and
25 deletions
+404
-25
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+8
-4
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+2
-2
mysql-test/ndb/ndbcluster.sh
mysql-test/ndb/ndbcluster.sh
+8
-4
mysql-test/r/ndb_restore.result
mysql-test/r/ndb_restore.result
+0
-8
mysql-test/t/ndb_restore.test
mysql-test/t/ndb_restore.test
+0
-3
storage/ndb/include/kernel/GlobalSignalNumbers.h
storage/ndb/include/kernel/GlobalSignalNumbers.h
+3
-3
storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
+65
-0
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+3
-0
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
+18
-0
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
+5
-0
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+164
-0
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
+116
-0
storage/ndb/src/mgmsrv/MgmtSrvr.hpp
storage/ndb/src/mgmsrv/MgmtSrvr.hpp
+2
-1
storage/ndb/src/ndbapi/ndberror.c
storage/ndb/src/ndbapi/ndberror.c
+10
-0
No files found.
mysql-test/mysql-test-run.pl
View file @
94e65a83
...
@@ -1374,7 +1374,8 @@ sub ndbcluster_install () {
...
@@ -1374,7 +1374,8 @@ sub ndbcluster_install () {
"
--verbose=2
",
"
--verbose=2
",
$ndbcluster_opts
,
$ndbcluster_opts
,
"
--initial
",
"
--initial
",
"
--relative-config-data-dir
"],
"
--relative-config-data-dir
",
"
--core
"],
"",
"",
"",
"")
)
"",
"",
"",
"")
)
{
{
mtr_error
("
Error ndbcluster_install
");
mtr_error
("
Error ndbcluster_install
");
...
@@ -1410,7 +1411,8 @@ sub ndbcluster_start ($) {
...
@@ -1410,7 +1411,8 @@ sub ndbcluster_start ($) {
if
(
mtr_run
("
$glob_mysql_test_dir
/ndb/ndbcluster
",
if
(
mtr_run
("
$glob_mysql_test_dir
/ndb/ndbcluster
",
["
--port=
$opt_ndbcluster_port
",
["
--port=
$opt_ndbcluster_port
",
"
--data-dir=
$opt_vardir
",
"
--data-dir=
$opt_vardir
",
"
--verbose=2
"],
"
--verbose=2
",
"
--core
"],
"",
"
/dev/null
",
"",
"")
)
"",
"
/dev/null
",
"",
"")
)
{
{
mtr_error
("
Error ndbcluster_start
");
mtr_error
("
Error ndbcluster_start
");
...
@@ -1467,7 +1469,8 @@ sub ndbcluster_install_slave () {
...
@@ -1467,7 +1469,8 @@ sub ndbcluster_install_slave () {
"
--small
",
"
--small
",
"
--ndbd-nodes=1
",
"
--ndbd-nodes=1
",
"
--initial
",
"
--initial
",
"
--relative-config-data-dir
"],
"
--relative-config-data-dir
",
"
--core
"],
"",
"",
"",
"")
)
"",
"",
"",
"")
)
{
{
mtr_error
("
Error ndbcluster_install_slave
");
mtr_error
("
Error ndbcluster_install_slave
");
...
@@ -1501,7 +1504,8 @@ sub ndbcluster_start_slave ($) {
...
@@ -1501,7 +1504,8 @@ sub ndbcluster_start_slave ($) {
["
--port=
$opt_ndbcluster_port_slave
",
["
--port=
$opt_ndbcluster_port_slave
",
"
--data-dir=
$opt_vardir
",
"
--data-dir=
$opt_vardir
",
"
--verbose=2
",
"
--verbose=2
",
"
--ndbd-nodes=1
"],
"
--ndbd-nodes=1
",
"
--core
"],
"",
"
/dev/null
",
"",
"")
)
"",
"
/dev/null
",
"",
"")
)
{
{
mtr_error
("
Error ndbcluster_start_slave
");
mtr_error
("
Error ndbcluster_start_slave
");
...
...
mysql-test/mysql-test-run.sh
View file @
94e65a83
...
@@ -1278,7 +1278,7 @@ start_ndbcluster()
...
@@ -1278,7 +1278,7 @@ start_ndbcluster()
then
then
NDBCLUSTER_EXTRA_OPTS
=
"--small"
NDBCLUSTER_EXTRA_OPTS
=
"--small"
fi
fi
OPTS
=
"
$NDBCLUSTER_OPTS
$NDBCLUSTER_EXTRA_OPTS
--verbose=
$NDB_VERBOSE
--initial --relative-config-data-dir"
OPTS
=
"
$NDBCLUSTER_OPTS
$NDBCLUSTER_EXTRA_OPTS
--verbose=
$NDB_VERBOSE
--initial --relative-config-data-dir
--core
"
if
[
"x
$NDB_VERBOSE
"
!=
"x0"
]
;
then
if
[
"x
$NDB_VERBOSE
"
!=
"x0"
]
;
then
echo
"Starting master ndbcluster "
$OPTS
echo
"Starting master ndbcluster "
$OPTS
fi
fi
...
@@ -1511,7 +1511,7 @@ start_slave()
...
@@ -1511,7 +1511,7 @@ start_slave()
NDBCLUSTER_EXTRA_OPTS
=
"--small"
NDBCLUSTER_EXTRA_OPTS
=
"--small"
fi
fi
OPTS
=
"
$NDBCLUSTER_OPTS_SLAVE
--initial
$NDBCLUSTER_EXTRA_OPTS
--ndbd-nodes=1 --verbose=
$NDB_VERBOSE
--relative-config-data-dir"
OPTS
=
"
$NDBCLUSTER_OPTS_SLAVE
--initial
$NDBCLUSTER_EXTRA_OPTS
--ndbd-nodes=1 --verbose=
$NDB_VERBOSE
--relative-config-data-dir
--core
"
if
[
"x
$NDB_VERBOSE
"
!=
"x0"
]
;
then
if
[
"x
$NDB_VERBOSE
"
!=
"x0"
]
;
then
echo
"Starting slave ndbcluster "
$OPTS
echo
"Starting slave ndbcluster "
$OPTS
fi
fi
...
...
mysql-test/ndb/ndbcluster.sh
View file @
94e65a83
...
@@ -53,6 +53,7 @@ status_ndb=
...
@@ -53,6 +53,7 @@ status_ndb=
ndb_diskless
=
0
ndb_diskless
=
0
ndbd_nodes
=
2
ndbd_nodes
=
2
relative_config_data_dir
=
relative_config_data_dir
=
opt_core
=
ndb_no_ord
=
512
ndb_no_ord
=
512
ndb_no_attr
=
2048
ndb_no_attr
=
2048
...
@@ -118,6 +119,9 @@ while test $# -gt 0; do
...
@@ -118,6 +119,9 @@ while test $# -gt 0; do
--ndbd-extra-opts
=
*
)
--ndbd-extra-opts
=
*
)
NDBD_EXTRA_OPTS
=
`
echo
"
$1
"
|
sed
-e
"s;--ndbd-extra-opts=;;"
`
NDBD_EXTRA_OPTS
=
`
echo
"
$1
"
|
sed
-e
"s;--ndbd-extra-opts=;;"
`
;;
;;
--core
)
opt_core
=
"--core"
;;
--verbose
=
*
)
--verbose
=
*
)
VERBOSE
=
`
echo
"
$1
"
|
sed
-e
"s;--verbose=;;"
`
VERBOSE
=
`
echo
"
$1
"
|
sed
-e
"s;--verbose=;;"
`
;;
;;
...
@@ -153,10 +157,10 @@ if [ ! -f "$config_ini" ]; then
...
@@ -153,10 +157,10 @@ if [ ! -f "$config_ini" ]; then
exit
1
exit
1
fi
fi
exec_mgmtclient
=
"
$exec_mgmtclient
--no-defaults
$NDB_MGM_EXTRA_OPTS
"
exec_mgmtclient
=
"
$exec_mgmtclient
--no-defaults
$
opt_core
$
NDB_MGM_EXTRA_OPTS
"
exec_mgmtsrvr
=
"
$exec_mgmtsrvr
--no-defaults
$NDB_MGMD_EXTRA_OPTS
"
exec_mgmtsrvr
=
"
$exec_mgmtsrvr
--no-defaults
$
opt_core
$
NDB_MGMD_EXTRA_OPTS
"
exec_ndb
=
"
$exec_ndb
--no-defaults
$NDBD_EXTRA_OPTS
"
exec_ndb
=
"
$exec_ndb
--no-defaults
$
opt_core
$
NDBD_EXTRA_OPTS
"
exec_waiter
=
"
$exec_waiter
--no-defaults"
exec_waiter
=
"
$exec_waiter
--no-defaults
$opt_core
"
ndb_host
=
"localhost"
ndb_host
=
"localhost"
ndb_mgmd_port
=
$port
ndb_mgmd_port
=
$port
...
...
mysql-test/r/ndb_restore.result
View file @
94e65a83
use test;
use test;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
id type state logging database schema name
2 UserTable Online Yes cluster_replication def apply_status
1 SystemTable Online Yes sys def NDB$EVENTS_0
3 UserTable Online Yes cluster_replication def schema
0 SystemTable Online Yes sys def SYSTAB_0
NDBT_ProgramExit: 0 - OK
CREATE TABLE `t1_c` (
CREATE TABLE `t1_c` (
`capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,
`capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,
`goaledatta` char(2) NOT NULL default '',
`goaledatta` char(2) NOT NULL default '',
...
...
mysql-test/t/ndb_restore.test
View file @
94e65a83
...
@@ -8,9 +8,6 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
...
@@ -8,9 +8,6 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
drop
table
if
exists
t1_c
,
t2_c
,
t3_c
,
t4_c
,
t5_c
,
t6_c
,
t7_c
,
t8_c
,
t9_c
;
drop
table
if
exists
t1_c
,
t2_c
,
t3_c
,
t4_c
,
t5_c
,
t6_c
,
t7_c
,
t8_c
,
t9_c
;
--
enable_warnings
--
enable_warnings
--
exec
$NDB_TOOLS_DIR
/
ndb_show_tables
--
exec
$NDB_MGM
--
no
-
defaults
-
e
"all dump 1000"
>>
$NDB_TOOLS_OUTPUT
CREATE
TABLE
`t1_c`
(
CREATE
TABLE
`t1_c`
(
`capgoaledatta`
smallint
(
5
)
unsigned
NOT
NULL
auto_increment
,
`capgoaledatta`
smallint
(
5
)
unsigned
NOT
NULL
auto_increment
,
`goaledatta`
char
(
2
)
NOT
NULL
default
''
,
`goaledatta`
char
(
2
)
NOT
NULL
default
''
,
...
...
storage/ndb/include/kernel/GlobalSignalNumbers.h
View file @
94e65a83
...
@@ -111,9 +111,9 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
...
@@ -111,9 +111,9 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
/* 57 unused */
/* 57 unused */
/* 58 unused */
/* 58 unused */
/* 59 unused */
/* 59 unused */
/* 60 unused */
#define GSN_ALLOC_NODEID_REQ 60
/* 61 unused */
#define GSN_ALLOC_NODEID_CONF 61
/* 62 unused */
#define GSN_ALLOC_NODEID_REF 62
/* 63 unused */
/* 63 unused */
/* 64 unused */
/* 64 unused */
/* 65 unused */
/* 65 unused */
...
...
storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
0 → 100644
View file @
94e65a83
/* Copyright (C) 2003 MySQL AB
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 */
#ifndef ALLOC_NODE_ID_HPP
#define ALLOC_NODE_ID_HPP
#include "SignalData.hpp"
#include <NodeBitmask.hpp>
/**
* Request to allocate node id
*/
class
AllocNodeIdReq
{
public:
STATIC_CONST
(
SignalLength
=
3
);
Uint32
senderRef
;
Uint32
senderData
;
Uint32
nodeId
;
};
class
AllocNodeIdConf
{
public:
STATIC_CONST
(
SignalLength
=
3
);
Uint32
senderRef
;
Uint32
senderData
;
Uint32
nodeId
;
};
class
AllocNodeIdRef
{
public:
STATIC_CONST
(
SignalLength
=
5
);
enum
ErrorCodes
{
NoError
=
0
,
Undefined
=
1
,
NF_FakeErrorREF
=
11
,
Busy
=
701
,
NotMaster
=
702
,
NodeReserved
=
1701
,
NodeConnected
=
1702
,
NodeFailureHandlingNotCompleted
=
1703
};
Uint32
senderRef
;
Uint32
senderData
;
Uint32
nodeId
;
Uint32
errorCode
;
Uint32
masterRef
;
};
#endif
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
View file @
94e65a83
...
@@ -1509,6 +1509,9 @@ void Ndbcntr::execNODE_FAILREP(Signal* signal)
...
@@ -1509,6 +1509,9 @@ void Ndbcntr::execNODE_FAILREP(Signal* signal)
sendSignal
(
SUMA_REF
,
GSN_NODE_FAILREP
,
signal
,
sendSignal
(
SUMA_REF
,
GSN_NODE_FAILREP
,
signal
,
NodeFailRep
::
SignalLength
,
JBB
);
NodeFailRep
::
SignalLength
,
JBB
);
sendSignal
(
QMGR_REF
,
GSN_NODE_FAILREP
,
signal
,
NodeFailRep
::
SignalLength
,
JBB
);
Uint32
nodeId
=
0
;
Uint32
nodeId
=
0
;
while
(
!
allFailed
.
isclear
()){
while
(
!
allFailed
.
isclear
()){
nodeId
=
allFailed
.
find
(
nodeId
+
1
);
nodeId
=
allFailed
.
find
(
nodeId
+
1
);
...
...
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
View file @
94e65a83
...
@@ -29,6 +29,10 @@
...
@@ -29,6 +29,10 @@
#include <signaldata/CmRegSignalData.hpp>
#include <signaldata/CmRegSignalData.hpp>
#include <signaldata/ApiRegSignalData.hpp>
#include <signaldata/ApiRegSignalData.hpp>
#include <signaldata/FailRep.hpp>
#include <signaldata/FailRep.hpp>
#include <signaldata/AllocNodeId.hpp>
#include <SafeCounter.hpp>
#include <RequestTracker.hpp>
#include "timer.hpp"
#include "timer.hpp"
...
@@ -222,6 +226,12 @@ private:
...
@@ -222,6 +226,12 @@ private:
void
execAPI_VERSION_REQ
(
Signal
*
signal
);
void
execAPI_VERSION_REQ
(
Signal
*
signal
);
void
execAPI_BROADCAST_REP
(
Signal
*
signal
);
void
execAPI_BROADCAST_REP
(
Signal
*
signal
);
void
execNODE_FAILREP
(
Signal
*
);
void
execALLOC_NODEID_REQ
(
Signal
*
);
void
execALLOC_NODEID_CONF
(
Signal
*
);
void
execALLOC_NODEID_REF
(
Signal
*
);
void
completeAllocNodeIdReq
(
Signal
*
);
// Arbitration signals
// Arbitration signals
void
execARBIT_CFG
(
Signal
*
signal
);
void
execARBIT_CFG
(
Signal
*
signal
);
void
execARBIT_PREPREQ
(
Signal
*
signal
);
void
execARBIT_PREPREQ
(
Signal
*
signal
);
...
@@ -388,6 +398,14 @@ private:
...
@@ -388,6 +398,14 @@ private:
Uint16
cprepFailedNodes
[
MAX_NDB_NODES
];
Uint16
cprepFailedNodes
[
MAX_NDB_NODES
];
Uint16
ccommitFailedNodes
[
MAX_NDB_NODES
];
Uint16
ccommitFailedNodes
[
MAX_NDB_NODES
];
struct
OpAllocNodeIdReq
{
RequestTracker
m_tracker
;
AllocNodeIdReq
m_req
;
Uint32
m_connectCount
;
Uint32
m_error
;
};
struct
OpAllocNodeIdReq
opAllocNodeIdReq
;
};
};
#endif
#endif
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
View file @
94e65a83
...
@@ -86,6 +86,11 @@ Qmgr::Qmgr(const class Configuration & conf)
...
@@ -86,6 +86,11 @@ Qmgr::Qmgr(const class Configuration & conf)
addRecSignal
(
GSN_SET_VAR_REQ
,
&
Qmgr
::
execSET_VAR_REQ
);
addRecSignal
(
GSN_SET_VAR_REQ
,
&
Qmgr
::
execSET_VAR_REQ
);
addRecSignal
(
GSN_API_BROADCAST_REP
,
&
Qmgr
::
execAPI_BROADCAST_REP
);
addRecSignal
(
GSN_API_BROADCAST_REP
,
&
Qmgr
::
execAPI_BROADCAST_REP
);
addRecSignal
(
GSN_NODE_FAILREP
,
&
Qmgr
::
execNODE_FAILREP
);
addRecSignal
(
GSN_ALLOC_NODEID_REQ
,
&
Qmgr
::
execALLOC_NODEID_REQ
);
addRecSignal
(
GSN_ALLOC_NODEID_CONF
,
&
Qmgr
::
execALLOC_NODEID_CONF
);
addRecSignal
(
GSN_ALLOC_NODEID_REF
,
&
Qmgr
::
execALLOC_NODEID_REF
);
// Arbitration signals
// Arbitration signals
addRecSignal
(
GSN_ARBIT_PREPREQ
,
&
Qmgr
::
execARBIT_PREPREQ
);
addRecSignal
(
GSN_ARBIT_PREPREQ
,
&
Qmgr
::
execARBIT_PREPREQ
);
addRecSignal
(
GSN_ARBIT_PREPCONF
,
&
Qmgr
::
execARBIT_PREPCONF
);
addRecSignal
(
GSN_ARBIT_PREPCONF
,
&
Qmgr
::
execARBIT_PREPCONF
);
...
...
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
View file @
94e65a83
...
@@ -3984,3 +3984,167 @@ Qmgr::execAPI_BROADCAST_REP(Signal* signal)
...
@@ -3984,3 +3984,167 @@ Qmgr::execAPI_BROADCAST_REP(Signal* signal)
NodeReceiverGroup
rg
(
API_CLUSTERMGR
,
mask
);
NodeReceiverGroup
rg
(
API_CLUSTERMGR
,
mask
);
sendSignal
(
rg
,
api
.
gsn
,
signal
,
len
,
JBB
);
// forward sections
sendSignal
(
rg
,
api
.
gsn
,
signal
,
len
,
JBB
);
// forward sections
}
}
void
Qmgr
::
execNODE_FAILREP
(
Signal
*
signal
)
{
jamEntry
();
// make sure any distributed signals get acknowledged
// destructive of the signal
c_counterMgr
.
execNODE_FAILREP
(
signal
);
}
void
Qmgr
::
execALLOC_NODEID_REQ
(
Signal
*
signal
)
{
jamEntry
();
const
AllocNodeIdReq
*
req
=
(
AllocNodeIdReq
*
)
signal
->
getDataPtr
();
Uint32
senderRef
=
req
->
senderRef
;
Uint32
nodeId
=
req
->
nodeId
;
Uint32
error
=
0
;
if
(
refToBlock
(
senderRef
)
!=
QMGR
)
// request from management server
{
/* master */
if
(
getOwnNodeId
()
!=
cpresident
)
error
=
AllocNodeIdRef
::
NotMaster
;
else
if
(
!
opAllocNodeIdReq
.
m_tracker
.
done
())
error
=
AllocNodeIdRef
::
Busy
;
else
if
(
c_connectedNodes
.
get
(
nodeId
))
error
=
AllocNodeIdRef
::
NodeConnected
;
if
(
error
)
{
jam
();
AllocNodeIdRef
*
ref
=
(
AllocNodeIdRef
*
)
signal
->
getDataPtrSend
();
ref
->
senderRef
=
reference
();
ref
->
errorCode
=
error
;
ref
->
masterRef
=
numberToRef
(
QMGR
,
cpresident
);
sendSignal
(
senderRef
,
GSN_ALLOC_NODEID_REF
,
signal
,
AllocNodeIdRef
::
SignalLength
,
JBB
);
return
;
}
opAllocNodeIdReq
.
m_req
=
*
req
;
opAllocNodeIdReq
.
m_error
=
0
;
opAllocNodeIdReq
.
m_connectCount
=
getNodeInfo
(
refToNode
(
senderRef
)).
m_connectCount
;
jam
();
AllocNodeIdReq
*
req
=
(
AllocNodeIdReq
*
)
signal
->
getDataPtrSend
();
req
->
senderRef
=
reference
();
NodeReceiverGroup
rg
(
QMGR
,
c_clusterNodes
);
RequestTracker
&
p
=
opAllocNodeIdReq
.
m_tracker
;
p
.
init
<
AllocNodeIdRef
>
(
c_counterMgr
,
rg
,
GSN_ALLOC_NODEID_REF
,
0
);
sendSignal
(
rg
,
GSN_ALLOC_NODEID_REQ
,
signal
,
AllocNodeIdReq
::
SignalLength
,
JBB
);
return
;
}
/* participant */
if
(
c_connectedNodes
.
get
(
nodeId
))
error
=
AllocNodeIdRef
::
NodeConnected
;
else
{
NodeRecPtr
nodePtr
;
nodePtr
.
i
=
nodeId
;
ptrAss
(
nodePtr
,
nodeRec
);
if
(
nodePtr
.
p
->
failState
!=
NORMAL
)
error
=
AllocNodeIdRef
::
NodeFailureHandlingNotCompleted
;
}
if
(
error
)
{
AllocNodeIdRef
*
ref
=
(
AllocNodeIdRef
*
)
signal
->
getDataPtrSend
();
ref
->
senderRef
=
reference
();
ref
->
errorCode
=
error
;
sendSignal
(
senderRef
,
GSN_ALLOC_NODEID_REF
,
signal
,
AllocNodeIdRef
::
SignalLength
,
JBB
);
return
;
}
AllocNodeIdConf
*
conf
=
(
AllocNodeIdConf
*
)
signal
->
getDataPtrSend
();
conf
->
senderRef
=
reference
();
sendSignal
(
senderRef
,
GSN_ALLOC_NODEID_CONF
,
signal
,
AllocNodeIdConf
::
SignalLength
,
JBB
);
}
void
Qmgr
::
execALLOC_NODEID_CONF
(
Signal
*
signal
)
{
/* master */
jamEntry
();
const
AllocNodeIdConf
*
conf
=
(
AllocNodeIdConf
*
)
signal
->
getDataPtr
();
opAllocNodeIdReq
.
m_tracker
.
reportConf
(
c_counterMgr
,
refToNode
(
conf
->
senderRef
));
completeAllocNodeIdReq
(
signal
);
}
void
Qmgr
::
execALLOC_NODEID_REF
(
Signal
*
signal
)
{
/* master */
jamEntry
();
const
AllocNodeIdRef
*
ref
=
(
AllocNodeIdRef
*
)
signal
->
getDataPtr
();
if
(
ref
->
errorCode
==
AllocNodeIdRef
::
NF_FakeErrorREF
)
{
opAllocNodeIdReq
.
m_tracker
.
ignoreRef
(
c_counterMgr
,
refToNode
(
ref
->
senderRef
));
}
else
{
opAllocNodeIdReq
.
m_tracker
.
reportRef
(
c_counterMgr
,
refToNode
(
ref
->
senderRef
));
if
(
opAllocNodeIdReq
.
m_error
==
0
)
opAllocNodeIdReq
.
m_error
=
ref
->
errorCode
;
}
completeAllocNodeIdReq
(
signal
);
}
void
Qmgr
::
completeAllocNodeIdReq
(
Signal
*
signal
)
{
/* master */
if
(
!
opAllocNodeIdReq
.
m_tracker
.
done
())
{
jam
();
return
;
}
if
(
opAllocNodeIdReq
.
m_connectCount
!=
getNodeInfo
(
refToNode
(
opAllocNodeIdReq
.
m_req
.
senderRef
)).
m_connectCount
)
{
// management server not same version as the original requester
jam
();
return
;
}
if
(
opAllocNodeIdReq
.
m_tracker
.
hasRef
())
{
jam
();
AllocNodeIdRef
*
ref
=
(
AllocNodeIdRef
*
)
signal
->
getDataPtrSend
();
ref
->
senderRef
=
reference
();
ref
->
senderData
=
opAllocNodeIdReq
.
m_req
.
senderData
;
ref
->
nodeId
=
opAllocNodeIdReq
.
m_req
.
nodeId
;
ref
->
errorCode
=
opAllocNodeIdReq
.
m_error
;
ref
->
masterRef
=
numberToRef
(
QMGR
,
cpresident
);
ndbassert
(
AllocNodeIdRef
::
SignalLength
==
5
);
sendSignal
(
opAllocNodeIdReq
.
m_req
.
senderRef
,
GSN_ALLOC_NODEID_REF
,
signal
,
AllocNodeIdRef
::
SignalLength
,
JBB
);
return
;
}
jam
();
AllocNodeIdConf
*
conf
=
(
AllocNodeIdConf
*
)
signal
->
getDataPtrSend
();
conf
->
senderRef
=
reference
();
conf
->
senderData
=
opAllocNodeIdReq
.
m_req
.
senderData
;
conf
->
nodeId
=
opAllocNodeIdReq
.
m_req
.
nodeId
;
ndbassert
(
AllocNodeIdConf
::
SignalLength
==
3
);
sendSignal
(
opAllocNodeIdReq
.
m_req
.
senderRef
,
GSN_ALLOC_NODEID_CONF
,
signal
,
AllocNodeIdConf
::
SignalLength
,
JBB
);
}
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
View file @
94e65a83
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
#include <signaldata/ManagementServer.hpp>
#include <signaldata/ManagementServer.hpp>
#include <signaldata/NFCompleteRep.hpp>
#include <signaldata/NFCompleteRep.hpp>
#include <signaldata/NodeFailRep.hpp>
#include <signaldata/NodeFailRep.hpp>
#include <signaldata/AllocNodeId.hpp>
#include <NdbSleep.h>
#include <NdbSleep.h>
#include <EventLogger.hpp>
#include <EventLogger.hpp>
#include <DebuggerNames.hpp>
#include <DebuggerNames.hpp>
...
@@ -1712,6 +1713,88 @@ MgmtSrvr::get_connected_nodes(NodeBitmask &connected_nodes) const
...
@@ -1712,6 +1713,88 @@ MgmtSrvr::get_connected_nodes(NodeBitmask &connected_nodes) const
}
}
}
}
int
MgmtSrvr
::
alloc_node_id_req
(
Uint32
free_node_id
)
{
SignalSender
ss
(
theFacade
);
ss
.
lock
();
// lock will be released on exit
SimpleSignal
ssig
;
AllocNodeIdReq
*
req
=
CAST_PTR
(
AllocNodeIdReq
,
ssig
.
getDataPtrSend
());
ssig
.
set
(
ss
,
TestOrd
::
TraceAPI
,
QMGR
,
GSN_ALLOC_NODEID_REQ
,
AllocNodeIdReq
::
SignalLength
);
req
->
senderRef
=
ss
.
getOwnRef
();
req
->
senderData
=
19
;
req
->
nodeId
=
free_node_id
;
int
do_send
=
1
;
NodeId
nodeId
=
0
;
while
(
1
)
{
if
(
nodeId
==
0
)
{
bool
next
;
while
((
next
=
getNextNodeId
(
&
nodeId
,
NDB_MGM_NODE_TYPE_NDB
))
==
true
&&
theFacade
->
get_node_alive
(
nodeId
)
==
false
);
if
(
!
next
)
return
NO_CONTACT_WITH_DB_NODES
;
do_send
=
1
;
}
if
(
do_send
)
{
if
(
ss
.
sendSignal
(
nodeId
,
&
ssig
)
!=
SEND_OK
)
{
return
SEND_OR_RECEIVE_FAILED
;
}
do_send
=
0
;
}
SimpleSignal
*
signal
=
ss
.
waitFor
();
int
gsn
=
signal
->
readSignalNumber
();
switch
(
gsn
)
{
case
GSN_ALLOC_NODEID_CONF
:
{
const
AllocNodeIdConf
*
const
conf
=
CAST_CONSTPTR
(
AllocNodeIdConf
,
signal
->
getDataPtr
());
return
0
;
}
case
GSN_ALLOC_NODEID_REF
:
{
const
AllocNodeIdRef
*
const
ref
=
CAST_CONSTPTR
(
AllocNodeIdRef
,
signal
->
getDataPtr
());
if
(
ref
->
errorCode
==
AllocNodeIdRef
::
NotMaster
||
ref
->
errorCode
==
AllocNodeIdRef
::
Busy
)
{
do_send
=
1
;
nodeId
=
refToNode
(
ref
->
masterRef
);
continue
;
}
return
ref
->
errorCode
;
}
case
GSN_NF_COMPLETEREP
:
{
const
NFCompleteRep
*
const
rep
=
CAST_CONSTPTR
(
NFCompleteRep
,
signal
->
getDataPtr
());
#ifdef VM_TRACE
ndbout_c
(
"Node %d fail completed"
,
rep
->
failedNodeId
);
#endif
if
(
rep
->
failedNodeId
==
nodeId
)
nodeId
=
0
;
continue
;
}
case
GSN_NODE_FAILREP
:{
// ignore NF_COMPLETEREP will come
continue
;
}
default:
report_unknown_signal
(
signal
);
return
SEND_OR_RECEIVE_FAILED
;
}
}
return
0
;
}
bool
bool
MgmtSrvr
::
alloc_node_id
(
NodeId
*
nodeId
,
MgmtSrvr
::
alloc_node_id
(
NodeId
*
nodeId
,
enum
ndb_mgm_node_type
type
,
enum
ndb_mgm_node_type
type
,
...
@@ -1836,6 +1919,39 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
...
@@ -1836,6 +1919,39 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
}
}
NdbMutex_Unlock
(
m_configMutex
);
NdbMutex_Unlock
(
m_configMutex
);
if
(
id_found
&&
client_addr
!=
0
)
{
int
res
=
alloc_node_id_req
(
id_found
);
unsigned
save_id_found
=
id_found
;
switch
(
res
)
{
case
0
:
// ok continue
break
;
case
NO_CONTACT_WITH_DB_NODES
:
// ok continue
break
;
default:
// something wrong
id_found
=
0
;
break
;
}
if
(
id_found
==
0
)
{
char
buf
[
128
];
ndb_error_string
(
res
,
buf
,
sizeof
(
buf
));
error_string
.
appfmt
(
"Cluster refused allocation of id %d. Error: %d (%s)."
,
save_id_found
,
res
,
buf
);
g_eventLogger
.
warning
(
"Cluster refused allocation of id %d. "
"Connection from ip %s. "
"Returned error string
\"
%s
\"
"
,
save_id_found
,
inet_ntoa
(((
struct
sockaddr_in
*
)(
client_addr
))
->
sin_addr
),
error_string
.
c_str
());
DBUG_RETURN
(
false
);
}
}
if
(
id_found
)
if
(
id_found
)
{
{
*
nodeId
=
id_found
;
*
nodeId
=
id_found
;
...
...
storage/ndb/src/mgmsrv/MgmtSrvr.hpp
View file @
94e65a83
...
@@ -507,6 +507,7 @@ private:
...
@@ -507,6 +507,7 @@ private:
*/
*/
int
getBlockNumber
(
const
BaseString
&
blockName
);
int
getBlockNumber
(
const
BaseString
&
blockName
);
int
alloc_node_id_req
(
Uint32
free_node_id
);
//**************************************************************************
//**************************************************************************
int
_blockNumber
;
int
_blockNumber
;
...
...
storage/ndb/src/ndbapi/ndberror.c
View file @
94e65a83
...
@@ -81,6 +81,7 @@ static const char* empty_string = "";
...
@@ -81,6 +81,7 @@ static const char* empty_string = "";
* 1400 - SUMA
* 1400 - SUMA
* 1500 - LGMAN
* 1500 - LGMAN
* 1600 - TSMAN
* 1600 - TSMAN
* 1700 - QMGR
* 4000 - API
* 4000 - API
* 4100 - ""
* 4100 - ""
* 4200 - ""
* 4200 - ""
...
@@ -451,6 +452,15 @@ ErrorBundle ErrorCodes[] = {
...
@@ -451,6 +452,15 @@ ErrorBundle ErrorCodes[] = {
{
1349
,
DMEC
,
AE
,
"Backup failed to allocate attribute record (check configuration)"
},
{
1349
,
DMEC
,
AE
,
"Backup failed to allocate attribute record (check configuration)"
},
{
1329
,
DMEC
,
AE
,
"Backup during software upgrade not supported"
},
{
1329
,
DMEC
,
AE
,
"Backup during software upgrade not supported"
},
/**
* Node id allocation error codes
*/
{
1700
,
DMEC
,
IE
,
"Undefined error"
},
{
1701
,
DMEC
,
AE
,
"Node already reserved"
},
{
1702
,
DMEC
,
AE
,
"Node already connected"
},
{
1703
,
DMEC
,
AE
,
"Node failure handling not completed"
},
/**
/**
* Still uncategorized
* Still uncategorized
*/
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment