@@ -2274,14 +2274,14 @@ MtmBuildConnectivityMatrix(nodemask_t* matrix)
22742274}
22752275
22762276
2277- static int MtmGetNumberOfVotingNodes ()
2277+ static int MtmGetNumberOfVotingNodes (nodemask_t clique )
22782278{
22792279int i ;
22802280int nVotingNodes = Mtm -> nAllNodes ;
2281- notebask_t deadNodeMask = Mtm -> deadNodeMask ;
2281+ nodemask_t deadNodeMask = Mtm -> deadNodeMask ;
22822282for (i = 0 ;deadNodeMask != 0 ;i ++ ) {
22832283if (BIT_CHECK (deadNodeMask ,i )) {
2284- if (!BIT_CHECK (newClique ,i )) {
2284+ if (!BIT_CHECK (clique ,i )) {
22852285nVotingNodes -= 1 ;
22862286}
22872287BIT_CLEAR (deadNodeMask ,i );
@@ -2300,7 +2300,7 @@ void MtmRefreshClusterStatus()
23002300nodemask_t matrix [MAX_NODES ];
23012301int cliqueSize ;
23022302nodemask_t oldClique = ~Mtm -> disabledNodeMask & (((nodemask_t )1 <<Mtm -> nAllNodes )- 1 );
2303- int nVotingNodes ;
2303+ int i , nVotingNodes ;
23042304
23052305MtmBuildConnectivityMatrix (matrix );
23062306newClique = MtmFindMaxClique (matrix ,Mtm -> nAllNodes ,& cliqueSize );
@@ -2321,7 +2321,7 @@ void MtmRefreshClusterStatus()
23212321newClique = MtmFindMaxClique (matrix ,Mtm -> nAllNodes ,& cliqueSize );
23222322}while (newClique != oldClique );
23232323
2324- nVotingNodes = MtmGetNumberOfVotingNodes ();
2324+ nVotingNodes = MtmGetNumberOfVotingNodes (newClique );
23252325if (cliqueSize >=nVotingNodes /2 + 1 || (cliqueSize == (nVotingNodes + 1 )/2 && MtmMajorNode )) {/* have quorum */
23262326fprintf (stderr ,"Old mask: " );
23272327for (i = 0 ;i < Mtm -> nAllNodes ;i ++ ) {
@@ -2386,7 +2386,8 @@ void MtmRefreshClusterStatus()
23862386 */
23872387void MtmCheckQuorum (void )
23882388{
2389- int nVotingNodes = MtmGetNumberOfVotingNodes ();
2389+ nodemask_t oldClique = ~Mtm -> disabledNodeMask & (((nodemask_t )1 <<Mtm -> nAllNodes )- 1 );
2390+ int nVotingNodes = MtmGetNumberOfVotingNodes (oldClique );
23902391
23912392if (Mtm -> nLiveNodes >=nVotingNodes /2 + 1 || (Mtm -> nLiveNodes == (nVotingNodes + 1 )/2 && MtmMajorNode )) {/* have quorum */
23922393if (Mtm -> status == MTM_IN_MINORITY ) {
@@ -4397,8 +4398,8 @@ Datum mtm_make_table_local(PG_FUNCTION_ARGS)
43974398rv = makeRangeVar (MULTIMASTER_SCHEMA_NAME ,MULTIMASTER_LOCAL_TABLES_TABLE ,-1 );
43984399rel = heap_openrv (rv ,RowExclusiveLock );
43994400if (rel != NULL ) {
4400- char * tableName = RelationGetRelationName ( rel );
4401- Oid schemaid = RelationGetNamespace ( rel );
4401+ char * tableName = get_rel_name ( reloid );
4402+ Oid schemaid = get_rel_namespace ( reloid );
44024403char * schemaName = get_namespace_name (schemaid );
44034404
44044405tupDesc = RelationGetDescr (rel );