external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check only for active nodes when running master_remove_node

pull/801/head
Brian Cloutier 2016-09-23 16:42:21 +03:00
parent fcd418214e
commit cd6a1b8d58
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/distributed/master/master_metadata_utility.c
View File

@ -26,6 +26,7 @@
#include "distributed/pg_dist_partition.h" #include "distributed/pg_dist_partition.h"
#include "distributed/pg_dist_shard.h" #include "distributed/pg_dist_shard.h"
#include "distributed/pg_dist_shard_placement.h" #include "distributed/pg_dist_shard_placement.h"
#include "distributed/relay_utility.h"
#include "distributed/worker_manager.h" #include "distributed/worker_manager.h"
#include "nodes/makefuncs.h" #include "nodes/makefuncs.h"
#include "parser/scansup.h" #include "parser/scansup.h"
@ -200,12 +201,12 @@ ShardLength(uint64 shardId)
/* /*
* NodeHasShardPlacements returns whether any shards are placed on this node * NodeHasShardPlacements returns whether any active shards are placed on this node
*/ */
bool bool
NodeHasShardPlacements(char *nodeName, int32 nodePort) NodeHasShardPlacements(char *nodeName, int32 nodePort)
{ {
const int scanKeyCount = 2; const int scanKeyCount = 3;
const bool indexOK = true; const bool indexOK = true;
bool hasPlacements = false; bool hasPlacements = false;
@ -221,6 +222,8 @@ NodeHasShardPlacements(char *nodeName, int32 nodePort)
BTEqualStrategyNumber, F_TEXTEQ, CStringGetTextDatum(nodeName)); BTEqualStrategyNumber, F_TEXTEQ, CStringGetTextDatum(nodeName));
ScanKeyInit(&scanKey[1], Anum_pg_dist_shard_placement_nodeport, ScanKeyInit(&scanKey[1], Anum_pg_dist_shard_placement_nodeport,
BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(nodePort)); BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(nodePort));
ScanKeyInit(&scanKey[2], Anum_pg_dist_shard_placement_shardstate,
BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(FILE_FINALIZED));
scanDescriptor = systable_beginscan(pgShardPlacement, scanDescriptor = systable_beginscan(pgShardPlacement,
DistShardPlacementNodeidIndexId(), indexOK, DistShardPlacementNodeidIndexId(), indexOK,