cluster/tier dont log error on lookup heal for files on hot tier

This is a backport of 12430

On fix-layout heal files are scanned. Files found are exist on the hot or cold
subvolume. Those not found in the cold tier would exist on the hot. They
should not be flagged as an error.

Replace INFO with TRACE for common tier migration logs. Frequent migration
was growing the log files too quickly.

On migratation failures, do not acrue files towards cycle limit's budget.

> Change-Id: Ie832ee07c43bce5477ae81c939d1fe8416a11615
> BUG: 1275383
> Signed-off-by: Dan Lambright <dlambrig@redhat.com>
> Reviewed-on: http://review.gluster.org/12430
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Joseph Fernandes
Signed-off-by: Dan Lambright <dlambrig@redhat.com>

Change-Id: Ia1ce5c3ac9c8c43cf3f3f7e0bd6161aa13affe5f
BUG: 1272398
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/12465
Tested-by: Gluster Build System <jenkins@build.gluster.com>

1 files changed, 14 insertions, 13 deletions

diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c
index ecb8709547c..bda4bf799c7 100644
--- a/xlators/cluster/dht/src/tier.c
+++ b/xlators/cluster/dht/src/tier.c
@@ -110,8 +110,8 @@ tier_check_same_node (xlator_t *this, loc_t *loc, gf_defrag_info_t *defrag)
         }
 
         if (gf_uuid_compare (node_uuid, defrag->node_uuid)) {
-                gf_msg (this->name, GF_LOG_INFO, 0, DHT_MSG_LOG_TIER_STATUS,
-                        "%s does not belong to this node", loc->path);
+                gf_msg_trace (this->name, 0,
+                              "%s does not belong to this node", loc->path);
                 ret = 1;
                 goto out;
         }
@@ -489,8 +489,8 @@ tier_migrate_using_query_file (void *_args)
                                 goto abort;
                         }
 
-                        gf_msg (this->name, GF_LOG_INFO, 0,
-                                DHT_MSG_LOG_TIER_STATUS, "Tier %d"
+                        gf_msg_trace (this->name, 0,
+                                "Tier %d"
                                 " src_subvol %s file %s",
                                 query_cbk_args->is_promotion,
                                 src_subvol->name,
@@ -548,13 +548,6 @@ tier_migrate_using_query_file (void *_args)
                                         defrag->tier_conf.blocks_total;
                                 pthread_mutex_unlock (&dm_stat_mutex);
                         }
-abort:
-                        loc_wipe(&loc);
-                        loc_wipe(&p_loc);
-
-                        token_str = NULL;
-                        token_str = strtok (NULL, delimiter);
-                        GF_FREE (link_str);
 
                         if ((++total_files > defrag->tier_conf.max_migrate_files) ||
                             (total_migrated_bytes > defrag->tier_conf.max_migrate_bytes)) {
@@ -566,6 +559,15 @@ abort:
                                         total_files);
                                 goto out;
                         }
+
+abort:
+                        loc_wipe(&loc);
+                        loc_wipe(&p_loc);
+
+                        token_str = NULL;
+                        token_str = strtok (NULL, delimiter);
+                        GF_FREE (link_str);
+
                 }
                 per_file_status = per_link_status;
 per_file_out:
@@ -1032,8 +1034,7 @@ tier_build_migration_qfile (demotion_args_t *args,
 
         ret = remove (GET_QFILE_PATH (is_promotion));
         if (ret == -1) {
-                gf_msg (args->this->name, GF_LOG_INFO, 0,
-                        DHT_MSG_LOG_TIER_STATUS,
+                gf_msg_trace (args->this->name, 0,
                         "Failed to remove %s",
                         GET_QFILE_PATH (is_promotion));
         }