summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorSusant Palai <spalai@redhat.com>2016-08-04 12:31:24 +0530
committerRaghavendra G <rgowdapp@redhat.com>2016-08-05 03:55:39 -0700
commit59378892641a10ba0268a044310264e52afe8ea0 (patch)
tree2023b9bd1e34471006aa9e6678a38cbe4ca18dd9 /xlators
parent2c97cac30a706fc3458ed557a9fe98b8d2d32ea9 (diff)
dht/rebalance: allocate migrator thread pool dynamically
Problems: The maximum number of migratior threads created was static set to "40". And the number of these threads get created in rebalance depends on the number of cores user has. If the number of cores exceeds 40, a crash or memory corruption can be seen. Fix: Make the migratior thread pool dynamic. > Change-Id: Ifbdac8a1a396363dd75e2f6bcb454070cfdbf839 > BUG: 1362070 > Reviewed-on: http://review.gluster.org/15000 > Smoke: Gluster Build System <jenkins@build.gluster.org> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Raghavendra G <rgowdapp@redhat.com> (cherry picked from commit b8e8bfc7e4d3eaf76bb637221bc6392ec10ca54b) Change-Id: Ifbdac8a1a396363dd75e2f6bcb454070cfdbf839 BUG: 1362070 Signed-off-by: Susant Palai <spalai@redhat.com> Reviewed-on: http://review.gluster.org/15062 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index d763237..81a8677 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -25,7 +25,6 @@
#define GF_DISK_SECTOR_SIZE 512
#define DHT_REBALANCE_PID 4242 /* Change it if required */
#define DHT_REBALANCE_BLKSIZE (128 * 1024)
-#define MAX_MIGRATOR_THREAD_COUNT 40
#define MAX_MIGRATE_QUEUE_COUNT 500
#define MIN_MIGRATE_QUEUE_COUNT 200
@@ -3419,7 +3418,7 @@ gf_defrag_start_crawl (void *data)
int thread_index = 0;
int err = 0;
int thread_spawn_count = 0;
- pthread_t tid[MAX_MIGRATOR_THREAD_COUNT];
+ pthread_t *tid = NULL;
gf_boolean_t is_tier_detach = _gf_false;
this = data;
@@ -3556,7 +3555,8 @@ gf_defrag_start_crawl (void *data)
gf_dht_mt_container_t);
if (!defrag->queue) {
- gf_log (this->name, GF_LOG_INFO, "No memory for queue");
+ gf_log (this->name, GF_LOG_ERROR, "No memory for "
+ "queue");
ret = -1;
goto out;
}
@@ -3568,6 +3568,15 @@ gf_defrag_start_crawl (void *data)
gf_msg_debug (this->name, 0, "thread_spawn_count: %d",
thread_spawn_count);
+ tid = GF_CALLOC (thread_spawn_count, sizeof (pthread_t),
+ gf_common_mt_pthread_t);
+ if (!tid) {
+ gf_log (this->name, GF_LOG_ERROR, "Insufficient memory "
+ "for tid");
+ ret = -1;
+ goto out;
+ }
+
defrag->current_thread_count = thread_spawn_count;
/*Spawn Threads Here*/
@@ -3657,6 +3666,8 @@ out:
pthread_join (tid[i], NULL);
}
+ GF_FREE (tid);
+
if (defrag->cmd == GF_DEFRAG_CMD_START_TIER) {
/* Wait for the tier fixlayout to
* complete if its was started.*/