diff options
42 files changed, 286 insertions, 287 deletions
diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c index 2b9aea191..cdcc4be2d 100644 --- a/cli/src/cli-cmd.c +++ b/cli/src/cli-cmd.c @@ -137,7 +137,7 @@ cli_cmd_process (struct cli_state *state, int argc, char **argv) if (ret) { cli_out ("Connection failed. Please check if gluster " "daemon is operational."); - gf_log ("", GF_LOG_NORMAL, "Exiting with: %d", ret); + gf_log ("", GF_LOG_INFO, "Exiting with: %d", ret); exit (ret); } } diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index ff568f63c..7afd38524 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -95,7 +95,7 @@ gf_cli3_1_probe_cbk (struct rpc_req *req, struct iovec *iov, goto out; } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to probe"); + gf_log ("cli", GF_LOG_INFO, "Received resp to probe"); if (!rsp.op_ret) { switch (rsp.op_errno) { case GF_PROBE_SUCCESS: @@ -171,7 +171,7 @@ gf_cli3_1_deprobe_cbk (struct rpc_req *req, struct iovec *iov, goto out; } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to deprobe"); + gf_log ("cli", GF_LOG_INFO, "Received resp to deprobe"); if (rsp.op_ret) { switch (rsp.op_errno) { case GF_DEPROBE_LOCALHOST: @@ -235,7 +235,7 @@ gf_cli3_1_list_friends_cbk (struct rpc_req *req, struct iovec *iov, } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to list: %d", + gf_log ("cli", GF_LOG_INFO, "Received resp to list: %d", rsp.op_ret); ret = rsp.op_ret; @@ -401,7 +401,7 @@ gf_cli3_1_get_volume_cbk (struct rpc_req *req, struct iovec *iov, } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to get vol: %d", + gf_log ("cli", GF_LOG_INFO, "Received resp to get vol: %d", rsp.op_ret); if (!rsp.op_ret) { @@ -581,7 +581,7 @@ out: if (dict) dict_destroy (dict); - gf_log ("", GF_LOG_NORMAL, "Returning: %d", ret); + gf_log ("", GF_LOG_INFO, "Returning: %d", ret); return ret; } @@ -612,7 +612,7 @@ gf_cli3_1_create_volume_cbk (struct rpc_req *req, struct iovec *iov, ret = dict_get_str (dict, "volname", &volname); - gf_log ("cli", GF_LOG_NORMAL, "Received resp to create volume"); + gf_log ("cli", GF_LOG_INFO, "Received resp to create volume"); if (rsp.op_ret && strcmp (rsp.op_errstr, "")) cli_out ("%s", rsp.op_errstr); else @@ -663,7 +663,7 @@ gf_cli3_1_delete_volume_cbk (struct rpc_req *req, struct iovec *iov, volname = local->u.delete_vol.volname; - gf_log ("cli", GF_LOG_NORMAL, "Received resp to delete volume"); + gf_log ("cli", GF_LOG_INFO, "Received resp to delete volume"); if (rsp.op_ret && strcmp (rsp.op_errstr, "")) cli_out (rsp.op_errstr); @@ -677,7 +677,7 @@ out: cli_local_wipe (local); if (rsp.volname) free (rsp.volname); - gf_log ("", GF_LOG_NORMAL, "Returning with %d", ret); + gf_log ("", GF_LOG_INFO, "Returning with %d", ret); return ret; } @@ -711,7 +711,7 @@ gf_cli3_1_start_volume_cbk (struct rpc_req *req, struct iovec *iov, if (local) volname = local->u.start_vol.volname; - gf_log ("cli", GF_LOG_NORMAL, "Received resp to start volume"); + gf_log ("cli", GF_LOG_INFO, "Received resp to start volume"); if (rsp.op_ret && strcmp (rsp.op_errstr, "")) cli_out ("%s", rsp.op_errstr); @@ -760,7 +760,7 @@ gf_cli3_1_stop_volume_cbk (struct rpc_req *req, struct iovec *iov, if (local) volname = local->u.start_vol.volname; - gf_log ("cli", GF_LOG_NORMAL, "Received resp to stop volume"); + gf_log ("cli", GF_LOG_INFO, "Received resp to stop volume"); if (rsp.op_ret && strcmp (rsp.op_errstr, "")) cli_out (rsp.op_errstr); @@ -912,7 +912,7 @@ gf_cli3_1_rename_volume_cbk (struct rpc_req *req, struct iovec *iov, } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to probe"); + gf_log ("cli", GF_LOG_INFO, "Received resp to probe"); cli_out ("Rename volume %s", (rsp.op_ret) ? "unsuccessful": "successful"); @@ -940,7 +940,7 @@ gf_cli3_1_reset_volume_cbk (struct rpc_req *req, struct iovec *iov, goto out; } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to reset"); + gf_log ("cli", GF_LOG_INFO, "Received resp to reset"); if (rsp.op_ret && strcmp (rsp.op_errstr, "")) cli_out ("%s", rsp.op_errstr); @@ -972,7 +972,7 @@ gf_cli3_1_set_volume_cbk (struct rpc_req *req, struct iovec *iov, goto out; } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to set"); + gf_log ("cli", GF_LOG_INFO, "Received resp to set"); if (rsp.op_ret && strcmp (rsp.op_errstr, "")) cli_out ("%s", rsp.op_errstr); @@ -1005,7 +1005,7 @@ gf_cli3_1_add_brick_cbk (struct rpc_req *req, struct iovec *iov, } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to add brick"); + gf_log ("cli", GF_LOG_INFO, "Received resp to add brick"); if (rsp.op_ret && strcmp (rsp.op_errstr, "")) cli_out ("%s", rsp.op_errstr); @@ -1041,7 +1041,7 @@ gf_cli3_1_remove_brick_cbk (struct rpc_req *req, struct iovec *iov, goto out; } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to remove brick"); + gf_log ("cli", GF_LOG_INFO, "Received resp to remove brick"); if (rsp.op_ret && strcmp (rsp.op_errstr, "")) cli_out ("%s", rsp.op_errstr); @@ -1166,7 +1166,7 @@ gf_cli3_1_replace_brick_cbk (struct rpc_req *req, struct iovec *iov, rb_operation_str = rsp.op_errstr; } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to replace brick"); + gf_log ("cli", GF_LOG_INFO, "Received resp to replace brick"); cli_out ("%s", rb_operation_str ? rb_operation_str : "Unknown operation"); @@ -1418,7 +1418,7 @@ gf_cli3_1_quota_cbk (struct rpc_req *req, struct iovec *iov, if (rsp.limit_list) print_limit_list (rsp.volname, rsp.limit_list); } else { - gf_log ("cli", GF_LOG_NORMAL, "Received resp to quota command "); + gf_log ("cli", GF_LOG_INFO, "Received resp to quota command "); if (rsp.op_errstr) cli_out ("%s", rsp.op_errstr); else @@ -1450,7 +1450,7 @@ gf_cli3_1_getspec_cbk (struct rpc_req *req, struct iovec *iov, goto out; } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to getspec"); + gf_log ("cli", GF_LOG_INFO, "Received resp to getspec"); spec = GF_MALLOC (rsp.op_ret + 1, cli_mt_char); if (!spec) { @@ -1487,7 +1487,7 @@ gf_cli3_1_pmap_b2p_cbk (struct rpc_req *req, struct iovec *iov, goto out; } - gf_log ("cli", GF_LOG_NORMAL, "Received resp to pmap b2p"); + gf_log ("cli", GF_LOG_INFO, "Received resp to pmap b2p"); cli_out ("%d", rsp.port); GF_FREE (spec); diff --git a/cli/src/input.c b/cli/src/input.c index 5c38efe13..b9d1d24e6 100644 --- a/cli/src/input.c +++ b/cli/src/input.c @@ -43,7 +43,7 @@ cli_batch (void *d) ret = cli_cmd_process (state, state->argc, state->argv); - gf_log ("", GF_LOG_NORMAL, "Exiting with: %d", ret); + gf_log ("", GF_LOG_INFO, "Exiting with: %d", ret); exit (ret); return NULL; diff --git a/contrib/fuse-lib/mount.c b/contrib/fuse-lib/mount.c index 83b4d4c3e..59f5837ed 100644 --- a/contrib/fuse-lib/mount.c +++ b/contrib/fuse-lib/mount.c @@ -627,7 +627,7 @@ gf_fuse_mount (const char *mountpoint, char *fsname, char *mnt_param) fd = fuse_mount_sys (mountpoint, fsname, mnt_param); if (fd == -1) { - gf_log ("glusterfs-fuse", GF_LOG_NORMAL, + gf_log ("glusterfs-fuse", GF_LOG_INFO, "direct mount failed (%s), " "retry to mount via fusermount", strerror (errno)); diff --git a/doc/glusterd.8 b/doc/glusterd.8 index 1bc08dc79..43c1570f6 100644 --- a/doc/glusterd.8 +++ b/doc/glusterd.8 @@ -37,7 +37,7 @@ The glusterd daemon is used for elastic volume management. The daemon must be ru File to use for logging. .TP \fB\-L=<LOGLEVEL>, \fB\-\-log\-level=<LOGLEVEL>\fR -Logging severity. Valid options are TRACE, DEBUG, NORMAL, WARNING, ERROR and CRITICAL (the default is NORMAL). +Logging severity. Valid options are TRACE, DEBUG, INFO, WARNING, ERROR and CRITICAL (the default is INFO). .TP \fB\-\-debug\fR Run the program in debug mode. This option sets \fB\-\-no\-daemon\fR, \fB\-\-log\-level\fR to DEBUG diff --git a/doc/glusterfs.8 b/doc/glusterfs.8 index cb030a9e2..7e4b2b49d 100644 --- a/doc/glusterfs.8 +++ b/doc/glusterfs.8 @@ -46,7 +46,7 @@ File to use as VOLUME-FILE (the default is /etc/glusterfs/glusterfs.vol). File to use for logging. .TP \fB\-L, \fB\-\-log\-level=LOGLEVEL\fR -Logging severity. Valid options are TRACE, DEBUG, NORMAL, WARNING, ERROR and CRITICAL (the default is WARNING). +Logging severity. Valid options are TRACE, DEBUG, INFO, WARNING, ERROR and CRITICAL (the default is WARNING). .TP \fB\-s, \fB\-\-volfile\-server=SERVER\fR Server to get the volume from. This option overrides \fB\-\-volfile \fR option. diff --git a/doc/glusterfsd.8 b/doc/glusterfsd.8 index 186342d10..dbf3e3fda 100644 --- a/doc/glusterfsd.8 +++ b/doc/glusterfsd.8 @@ -50,7 +50,7 @@ File to use as VOLUME-FILE [default:/etc/glusterfs/glusterfs.vol] File to use for logging [default:/var/log/glusterfs/glusterfs.log] .TP \fB\-L, \fB\-\-log\-level=LOGLEVEL\fR -Logging severity. Valid options are TRACE, DEBUG, NORMAL, WARNING, ERROR and +Logging severity. Valid options are TRACE, DEBUG, INFO, WARNING, ERROR and CRITICAL [default: WARNING] .TP \fB\-s, \fB\-\-volfile\-server=SERVER\fR diff --git a/doc/mount.glusterfs.8 b/doc/mount.glusterfs.8 index d4927e0a9..0552f7f61 100644 --- a/doc/mount.glusterfs.8 +++ b/doc/mount.glusterfs.8 @@ -45,7 +45,7 @@ File to use for logging [default:/var/log/glusterfs/glusterfs.log] .TP \fBlog\-level=\fRLOG-LEVEL Logging severity. Valid options are TRACE, DEBUG, WARNING, ERROR, CRITICAL -NORMAL and NONE [default: NORMAL] +INFO and NONE [default: INFO] .TP \fBro\fR Mount the filesystem read-only diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 77b18e972..1e10056ac 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -634,7 +634,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count, size = rsp.op_ret; if (size == oldvollen && (memcmp (oldvolfile, rsp.spec, size) == 0)) { - gf_log ("", GF_LOG_NORMAL, "No change in volfile, continuing"); + gf_log ("", GF_LOG_INFO, "No change in volfile, continuing"); goto out; } diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index d784e0d87..9406d74ac 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -113,8 +113,8 @@ static struct argp_option gf_options[] = { "File to use as VOLUME FILE"}, {"log-level", ARGP_LOG_LEVEL_KEY, "LOGLEVEL", 0, - "Logging severity. Valid options are DEBUG, NORMAL, WARNING, ERROR, " - "CRITICAL and NONE [default: NORMAL]"}, + "Logging severity. Valid options are DEBUG, INFO, WARNING, ERROR, " + "CRITICAL and NONE [default: INFO]"}, {"log-file", ARGP_LOG_FILE_KEY, "LOGFILE", 0, "File to use for logging [default: " DEFAULT_LOG_FILE_DIRECTORY "/" PACKAGE_NAME ".log" "]"}, @@ -529,8 +529,8 @@ parse_opts (int key, char *arg, struct argp_state *state) cmd_args->log_level = GF_LOG_WARNING; break; } - if (strcasecmp (arg, ARGP_LOG_LEVEL_NORMAL_OPTION) == 0) { - cmd_args->log_level = GF_LOG_NORMAL; + if (strcasecmp (arg, ARGP_LOG_LEVEL_INFO_OPTION) == 0) { + cmd_args->log_level = GF_LOG_INFO; break; } if (strcasecmp (arg, ARGP_LOG_LEVEL_DEBUG_OPTION) == 0) { diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h index ffe8b596e..6fb1ebbe3 100644 --- a/glusterfsd/src/glusterfsd.h +++ b/glusterfsd/src/glusterfsd.h @@ -30,7 +30,7 @@ #define DEFAULT_CLIENT_VOLFILE CONFDIR "/glusterfs.vol" #define DEFAULT_SERVER_VOLFILE CONFDIR "/glusterfsd.vol" #define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" -#define DEFAULT_LOG_LEVEL GF_LOG_NORMAL +#define DEFAULT_LOG_LEVEL GF_LOG_INFO #define DEFAULT_EVENT_POOL_SIZE 16384 @@ -39,7 +39,7 @@ #define ARGP_LOG_LEVEL_CRITICAL_OPTION "CRITICAL" #define ARGP_LOG_LEVEL_ERROR_OPTION "ERROR" #define ARGP_LOG_LEVEL_WARNING_OPTION "WARNING" -#define ARGP_LOG_LEVEL_NORMAL_OPTION "NORMAL" +#define ARGP_LOG_LEVEL_INFO_OPTION "INFO" #define ARGP_LOG_LEVEL_DEBUG_OPTION "DEBUG" #define ENABLE_NO_DAEMON_MODE 1 diff --git a/libglusterfs/src/latency.c b/libglusterfs/src/latency.c index 7dfa13d14..aaa196a19 100644 --- a/libglusterfs/src/latency.c +++ b/libglusterfs/src/latency.c @@ -176,7 +176,7 @@ gf_latency_toggle (int signum) if (ctx) { ctx->measure_latency = !ctx->measure_latency; - gf_log ("[core]", GF_LOG_NORMAL, + gf_log ("[core]", GF_LOG_INFO, "Latency measurement turned %s", ctx->measure_latency ? "on" : "off"); } diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c index c7f256150..eaa735d5f 100644 --- a/libglusterfs/src/logging.c +++ b/libglusterfs/src/logging.c @@ -217,7 +217,7 @@ _gf_log_nomem (const char *domain, const char *file, "E", /* ERROR */ "W", /* WARNING */ "N", /* NOTICE */ - "I", /* INFO/NORMAL */ + "I", /* INFO */ "D", /* DEBUG */ "T", /* TRACE */ ""}; @@ -337,7 +337,7 @@ _gf_log_callingfn (const char *domain, const char *file, const char *function, "E", /* ERROR */ "W", /* WARNING */ "N", /* NOTICE */ - "I", /* INFO/NORMAL */ + "I", /* INFO */ "D", /* DEBUG */ "T", /* TRACE */ ""}; @@ -483,7 +483,7 @@ _gf_log (const char *domain, const char *file, const char *function, int line, "E", /* ERROR */ "W", /* WARNING */ "N", /* NOTICE */ - "I", /* INFO/NORMAL */ + "I", /* INFO */ "D", /* DEBUG */ "T", /* TRACE */ ""}; diff --git a/libglusterfs/src/logging.h b/libglusterfs/src/logging.h index 0664b2efa..0a76f1612 100644 --- a/libglusterfs/src/logging.h +++ b/libglusterfs/src/logging.h @@ -64,7 +64,6 @@ typedef enum { GF_LOG_WARNING, /* info about normal operation */ GF_LOG_NOTICE, GF_LOG_INFO, /* Normal information */ -#define GF_LOG_NORMAL GF_LOG_INFO GF_LOG_DEBUG, /* internal errors */ GF_LOG_TRACE, /* full trace of operation */ } gf_loglevel_t; diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 4091cc2a2..f000aaf92 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -2509,7 +2509,7 @@ afr_notify (xlator_t *this, int32_t event, up_children++; if (up_children == 1) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "Subvolume '%s' came back up; " "going online.", ((xlator_t *)data)->name); diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c index 3371bff86..81d8c9d69 100644 --- a/xlators/cluster/afr/src/afr-lk-common.c +++ b/xlators/cluster/afr/src/afr-lk-common.c @@ -273,7 +273,7 @@ afr_trace_inodelk_out (call_frame_t *frame, afr_lock_call_type_t lock_call_type, afr_print_verdict (op_ret, op_errno, verdict); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[%s %s] [%s] Lockee={%s} Number={%llu}", lock_call_type_str, lk_op_type == AFR_LOCK_OP ? "LOCK REPLY" : "UNLOCK REPLY", @@ -311,7 +311,7 @@ afr_trace_inodelk_in (call_frame_t *frame, afr_lock_call_type_t lock_call_type, afr_set_lock_call_type (lock_call_type, lock_call_type_str, int_lock); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[%s %s] Lock={%s} Lockee={%s} Number={%llu}", lock_call_type_str, lk_op_type == AFR_LOCK_OP ? "LOCK REQUEST" : "UNLOCK REQUEST", @@ -348,7 +348,7 @@ afr_trace_entrylk_in (call_frame_t *frame, afr_lock_call_type_t lock_call_type, afr_set_lock_call_type (lock_call_type, lock_call_type_str, int_lock); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[%s %s] Lock={%s} Lockee={%s} Number={%llu}", lock_call_type_str, lk_op_type == AFR_LOCK_OP ? "LOCK REQUEST" : "UNLOCK REQUEST", @@ -386,7 +386,7 @@ afr_trace_entrylk_out (call_frame_t *frame, afr_lock_call_type_t lock_call_type, afr_print_verdict (op_ret, op_errno, verdict); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[%s %s] [%s] Lock={%s} Lockee={%s} Number={%llu}", lock_call_type_str, lk_op_type == AFR_LOCK_OP ? "LOCK REPLY" : "UNLOCK REPLY", diff --git a/xlators/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c index 81c591651..e6304a5ea 100644 --- a/xlators/cluster/afr/src/afr-open.c +++ b/xlators/cluster/afr/src/afr-open.c @@ -430,7 +430,7 @@ afr_openfd_sh (call_frame_t *frame, xlator_t *this) afr_self_heal_type_str_get(&local->self_heal, sh_type_str, sizeof(sh_type_str)); - gf_log (this->name, GF_LOG_NORMAL, "%s self-heal triggered. " + gf_log (this->name, GF_LOG_INFO, "%s self-heal triggered. " "path: %s, reason: Replicate up down flush, data lock is held", sh_type_str, local->loc.path); diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c index 5b1a4f623..c2f4a726a 100644 --- a/xlators/cluster/afr/src/pump.c +++ b/xlators/cluster/afr/src/pump.c @@ -1553,10 +1553,10 @@ pump_command_reply (call_frame_t *frame, xlator_t *this) local = frame->local; if (local->op_ret < 0) - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "Command failed"); else - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "Command succeeded"); dict_unref (local->dict); diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 6a8455b51..f8087baa0 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -3520,7 +3520,7 @@ dht_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc) if (dht_filter_loc_subvol_key (this, loc, &local->loc, &cached_subvol)) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "unlinking %s on %s (given path %s)", local->loc.path, cached_subvol->name, loc->path); STACK_WIND (frame, dht_unlink_cbk, @@ -3827,7 +3827,7 @@ dht_create (call_frame_t *frame, xlator_t *this, if (dht_filter_loc_subvol_key (this, loc, &local->loc, &subvol)) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "creating %s on %s (got create on %s)", local->loc.path, subvol->name, loc->path); STACK_WIND (frame, dht_create_cbk, diff --git a/xlators/cluster/dht/src/switch.c b/xlators/cluster/dht/src/switch.c index 20356e24e..ada6b2c46 100644 --- a/xlators/cluster/dht/src/switch.c +++ b/xlators/cluster/dht/src/switch.c @@ -708,7 +708,7 @@ set_switch_pattern (xlator_t *this, dht_conf_t *conf, pattern = strtok_r (dup_str, ":", &tmp_str1); childs = strtok_r (NULL, ":", &tmp_str1); if (strncmp (pattern, "*", 2) == 0) { - gf_log ("switch", GF_LOG_NORMAL, + gf_log ("switch", GF_LOG_INFO, "'*' pattern will be taken by default " "for all the unconfigured child nodes," " hence neglecting current option"); diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index 85a757f5a..326645cf3 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -540,7 +540,7 @@ ios_stats_cleanup (xlator_t *this, inode_t *inode) fprintf (logfp, fmt); \ fprintf (logfp, "\n"); \ } \ - gf_log (this->name, GF_LOG_NORMAL, fmt); \ + gf_log (this->name, GF_LOG_INFO, fmt); \ } while (0) int @@ -927,38 +927,38 @@ io_stats_dump_fd (xlator_t *this, struct ios_fd *iosfd) sec = now.tv_sec - iosfd->opened_at.tv_sec; usec = now.tv_usec - iosfd->opened_at.tv_usec; - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "--- fd stats ---"); if (iosfd->filename) - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, " Filename : %s", iosfd->filename); if (sec) - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, " Lifetime : %"PRId64"secs, %"PRId64"usecs", sec, usec); if (iosfd->data_read) - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, " BytesRead : %"PRId64" bytes", iosfd->data_read); if (iosfd->data_written) - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, " BytesWritten : %"PRId64" bytes", iosfd->data_written); for (i = 0; i < 32; i++) { if (iosfd->block_count_read[i]) - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, " Read %06db+ : %"PRId64, (1 << i), iosfd->block_count_read[i]); } for (i = 0; i < 32; i++) { if (iosfd->block_count_write[i]) - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "Write %06db+ : %"PRId64, (1 << i), iosfd->block_count_write[i]); } @@ -2492,7 +2492,7 @@ fini (xlator_t *this) GF_FREE(conf); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "io-stats translator unloaded"); return; } diff --git a/xlators/debug/trace/src/trace.c b/xlators/debug/trace/src/trace.c index c7c6a867c..9541a64ab 100644 --- a/xlators/debug/trace/src/trace.c +++ b/xlators/debug/trace/src/trace.c @@ -41,7 +41,7 @@ struct { int enabled; } trace_fop_names[GF_FOP_MAXVALUE]; -int trace_log_level = GF_LOG_NORMAL; +int trace_log_level = GF_LOG_INFO; static char * trace_stat_to_str (struct iatt *buf) @@ -108,7 +108,7 @@ trace_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preparentstr = trace_stat_to_str (preparent); postparentstr = trace_stat_to_str (postparent); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s (op_ret=%d, fd=%p" "*stbuf {%s}, *preparent {%s}, *postparent = " "{%s})", frame->root->unique, @@ -125,7 +125,7 @@ trace_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, /* for 'release' log */ fd_ctx_set (fd, this, 0); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, op_errno=%d)", frame->root->unique, op_ret, op_errno); } @@ -144,7 +144,7 @@ trace_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, { if (trace_fop_names[GF_FOP_OPEN].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d, *fd=%p", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno, fd); } @@ -167,7 +167,7 @@ trace_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (trace_fop_names[GF_FOP_STAT].enabled) { if (op_ret >= 0) { statstr = trace_stat_to_str (buf); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d buf=%s", frame->root->unique, uuid_utoa (frame->local), op_ret, statstr); @@ -175,7 +175,7 @@ trace_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (statstr) GF_FREE (statstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d)", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); } @@ -197,7 +197,7 @@ trace_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (trace_fop_names[GF_FOP_READ].enabled) { if (op_ret >= 0) { statstr = trace_stat_to_str (buf); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d buf=%s", frame->root->unique, uuid_utoa (frame->local), op_ret, statstr); @@ -205,7 +205,7 @@ trace_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (statstr) GF_FREE (statstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d)", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -232,7 +232,7 @@ trace_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preopstr = trace_stat_to_str (prebuf); postopstr = trace_stat_to_str (postbuf); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, *prebuf = {%s}, " "*postbuf = {%s})", frame->root->unique, op_ret, @@ -244,7 +244,7 @@ trace_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postopstr) GF_FREE (postopstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -263,7 +263,7 @@ trace_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, gf_dirent_t *buf) { if (trace_fop_names[GF_FOP_READDIR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64" : gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); } @@ -280,7 +280,7 @@ trace_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, gf_dirent_t *buf) { if (trace_fop_names[GF_FOP_READDIRP].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64" : gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); } @@ -305,7 +305,7 @@ trace_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preopstr = trace_stat_to_str (prebuf); postopstr = trace_stat_to_str (postbuf); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, *prebuf = {%s}, " "*postbuf = {%s}", frame->root->unique, op_ret, @@ -317,7 +317,7 @@ trace_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postopstr) GF_FREE (postopstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -344,7 +344,7 @@ trace_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preopstr = trace_stat_to_str (statpre); postopstr = trace_stat_to_str (statpost); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, *prebuf = {%s}, " "*postbuf = {%s})", frame->root->unique, op_ret, @@ -356,7 +356,7 @@ trace_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postopstr) GF_FREE (postopstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d)", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); } @@ -381,7 +381,7 @@ trace_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preopstr = trace_stat_to_str (statpre); postopstr = trace_stat_to_str (statpost); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, *prebuf = {%s}, " "*postbuf = {%s})", frame->root->unique, op_ret, @@ -393,7 +393,7 @@ trace_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postopstr) GF_FREE (postopstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d)", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); } @@ -419,7 +419,7 @@ trace_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preparentstr = trace_stat_to_str (preparent); postparentstr = trace_stat_to_str (postparent); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, *preparent = {%s}, " "*postparent = {%s})", frame->root->unique, uuid_utoa (frame->local), op_ret, preparentstr, @@ -431,7 +431,7 @@ trace_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postparentstr) GF_FREE (postparentstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d)", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); } @@ -465,7 +465,7 @@ trace_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, prenewparentstr = trace_stat_to_str (prenewparent); postnewparentstr = trace_stat_to_str (postnewparent); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, *stbuf = {%s}, " "*preoldparent = {%s}, *postoldparent = {%s}" " *prenewparent = {%s}, *postnewparent = {%s})", @@ -485,7 +485,7 @@ trace_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postnewparentstr) GF_FREE (postnewparentstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -511,13 +511,13 @@ trace_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (op_ret == 0) { statstr = trace_stat_to_str (stbuf); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, op_errno=%d, buf=%s, " "stbuf = { %s })", frame->root->unique, op_ret, op_errno, buf, statstr); } else - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -546,7 +546,7 @@ trace_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, statstr = trace_stat_to_str (buf); postparentstr = trace_stat_to_str (postparent); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s (op_ret=%d " "*buf {%s}, *postparent {%s}", frame->root->unique, uuid_utoa (inode->gfid), @@ -560,7 +560,7 @@ trace_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, /* For 'forget' */ inode_ctx_put (inode, this, 0); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d)", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -590,7 +590,7 @@ trace_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preparentstr = trace_stat_to_str (preparent); postparentstr = trace_stat_to_str (postparent); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s (op_ret=%d " "*stbuf = {%s}, *preparent = {%s}, " "*postparent = {%s})", @@ -607,7 +607,7 @@ trace_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, GF_FREE (postparentstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": op_ret=%d, op_errno=%d", frame->root->unique, op_ret, op_errno); } @@ -636,7 +636,7 @@ trace_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preparentstr = trace_stat_to_str (preparent); postparentstr = trace_stat_to_str (postparent); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s (op_ret=%d " "*stbuf = {%s}, *preparent = {%s}, " "*postparent = {%s})", @@ -652,7 +652,7 @@ trace_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postparentstr) GF_FREE (postparentstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, op_errno=%d)", frame->root->unique, op_ret, op_errno); } @@ -681,7 +681,7 @@ trace_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preparentstr = trace_stat_to_str (preparent); postparentstr = trace_stat_to_str (postparent); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s (op_ret=%d " ", *stbuf = {%s}, *prebuf = {%s}, " "*postbuf = {%s} )", @@ -697,7 +697,7 @@ trace_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postparentstr) GF_FREE (postparentstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, op_errno=%d)", frame->root->unique, op_ret, op_errno); } @@ -726,7 +726,7 @@ trace_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preparentstr = trace_stat_to_str (preparent); postparentstr = trace_stat_to_str (postparent); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, *stbuf = {%s}, " " *prebuf = {%s}, *postbuf = {%s})", frame->root->unique, op_ret, @@ -741,7 +741,7 @@ trace_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postparentstr) GF_FREE (postparentstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -760,7 +760,7 @@ trace_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_FLUSH].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -777,7 +777,7 @@ trace_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, fd_t *fd) { if (trace_fop_names[GF_FOP_OPENDIR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d, fd=%p", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno, fd); @@ -806,7 +806,7 @@ trace_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preparentstr = trace_stat_to_str (preparent); postparentstr = trace_stat_to_str (postparent); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, *prebuf = {%s}, " "*postbuf = {%s}", frame->root->unique, uuid_utoa (frame->local), @@ -818,7 +818,7 @@ trace_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postparentstr) GF_FREE (postparentstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -845,7 +845,7 @@ trace_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, preopstr = trace_stat_to_str (prebuf); postopstr = trace_stat_to_str (postbuf); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, *prebuf = {%s}, " "*postbuf = {%s} )", frame->root->unique, op_ret, preopstr, @@ -857,7 +857,7 @@ trace_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (postopstr) GF_FREE (postopstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -876,7 +876,7 @@ trace_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this, { if (trace_fop_names[GF_FOP_STATFS].enabled) { if (op_ret >= 0) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": ({f_bsize=%lu, f_frsize=%lu, f_blocks=%"GF_PRI_FSBLK ", f_bfree=%"GF_PRI_FSBLK", f_bavail=%"GF_PRI_FSBLK", " "f_files=%"GF_PRI_FSBLK", f_ffree=%"GF_PRI_FSBLK", f_favail=%" @@ -885,7 +885,7 @@ trace_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this, buf->f_bfree, buf->f_bavail, buf->f_files, buf->f_ffree, buf->f_favail, buf->f_fsid, buf->f_flag, buf->f_namemax, op_ret); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": (op_ret=%d, op_errno=%d)", frame->root->unique, op_ret, op_errno); } @@ -902,7 +902,7 @@ trace_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_SETXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -919,7 +919,7 @@ trace_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *dict) { if (trace_fop_names[GF_FOP_GETXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d, dict=%p", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno, dict); @@ -936,7 +936,7 @@ trace_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_FSETXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -953,7 +953,7 @@ trace_fgetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *dict) { if (trace_fop_names[GF_FOP_FGETXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d, dict=%p", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno, dict); @@ -970,7 +970,7 @@ trace_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_REMOVEXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -988,7 +988,7 @@ trace_fsyncdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_FSYNCDIR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1005,7 +1005,7 @@ trace_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_ACCESS].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d)", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1030,7 +1030,7 @@ trace_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, prebufstr = trace_stat_to_str (prebuf); postbufstr = trace_stat_to_str (postbuf); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": op_ret=%d, *prebuf = {%s}, " "*postbuf = {%s} )", frame->root->unique, op_ret, @@ -1043,7 +1043,7 @@ trace_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, GF_FREE (postbufstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1065,7 +1065,7 @@ trace_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (trace_fop_names[GF_FOP_FSTAT].enabled) { if (op_ret >= 0) { statstr = trace_stat_to_str (buf); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d buf=%s", frame->root->unique, uuid_utoa (frame->local), op_ret, statstr); @@ -1073,7 +1073,7 @@ trace_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (statstr) GF_FREE (statstr); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1092,14 +1092,14 @@ trace_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, { if (trace_fop_names[GF_FOP_LK].enabled) { if (op_ret >= 0) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, {l_type=%d, l_whence=%d, " "l_start=%"PRId64", l_len=%"PRId64", l_pid=%u})", frame->root->unique, uuid_utoa (frame->local), op_ret, lock->l_type, lock->l_whence, lock->l_start, lock->l_len, lock->l_pid); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d)", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1118,7 +1118,7 @@ trace_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_ENTRYLK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1134,7 +1134,7 @@ trace_fentrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_FENTRYLK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1151,7 +1151,7 @@ trace_xattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *dict) { if (trace_fop_names[GF_FOP_XATTROP].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1168,7 +1168,7 @@ trace_fxattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *dict) { if (trace_fop_names[GF_FOP_FXATTROP].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1185,7 +1185,7 @@ trace_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_INODELK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); @@ -1201,7 +1201,7 @@ trace_finodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno) { if (trace_fop_names[GF_FOP_FINODELK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d, op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); } @@ -1218,7 +1218,7 @@ trace_rchecksum_cbk (call_frame_t *frame, void *cookie, xlator_t *this, uint32_t weak_checksum, uint8_t *strong_checksum) { if (trace_fop_names[GF_FOP_RCHECKSUM].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s op_ret=%d op_errno=%d", frame->root->unique, uuid_utoa (frame->local), op_ret, op_errno); } @@ -1238,7 +1238,7 @@ trace_entrylk (call_frame_t *frame, xlator_t *this, entrylk_cmd cmd, entrylk_type type) { if (trace_fop_names[GF_FOP_ENTRYLK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s volume=%s, (path=%s basename=%s, " "cmd=%s, type=%s)", frame->root->unique, uuid_utoa (loc->inode->gfid), @@ -1306,7 +1306,7 @@ trace_inodelk (call_frame_t *frame, xlator_t *this, const char *volume, break; } - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s volume=%s, (path=%s " "cmd=%s, type=%s, start=%llu, len=%llu, pid=%llu)", frame->root->unique, uuid_utoa (loc->inode->gfid), @@ -1374,7 +1374,7 @@ trace_finodelk (call_frame_t *frame, xlator_t *this, const char *volume, break; } - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s volume=%s, (fd =%p " "cmd=%s, type=%s, start=%llu, len=%llu, pid=%llu)", frame->root->unique, uuid_utoa (fd->inode->gfid), volume, fd, @@ -1397,7 +1397,7 @@ trace_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc, gf_xattrop_flags_t flags, dict_t *dict) { if (trace_fop_names[GF_FOP_XATTROP].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s (path=%s flags=%d)", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, flags); @@ -1418,7 +1418,7 @@ trace_fxattrop (call_frame_t *frame, xlator_t *this, fd_t *fd, gf_xattrop_flags_t flags, dict_t *dict) { if (trace_fop_names[GF_FOP_FXATTROP].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p, flags=%d", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, flags); @@ -1440,7 +1440,7 @@ trace_lookup (call_frame_t *frame, xlator_t *this, { if (trace_fop_names[GF_FOP_LOOKUP].enabled) { /* TODO: print all the keys mentioned in xattr_req */ - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path); @@ -1460,7 +1460,7 @@ int trace_stat (call_frame_t *frame, xlator_t *this, loc_t *loc) { if (trace_fop_names[GF_FOP_STAT].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path); @@ -1480,7 +1480,7 @@ int trace_readlink (call_frame_t *frame, xlator_t *this, loc_t *loc, size_t size) { if (trace_fop_names[GF_FOP_READLINK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s, size=%"GF_PRI_SIZET")", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, size); @@ -1501,7 +1501,7 @@ trace_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode, dev_t dev, dict_t *params) { if (trace_fop_names[GF_FOP_MKNOD].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s mode=%d dev=%"GF_PRI_DEV")", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, mode, dev); @@ -1521,7 +1521,7 @@ trace_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode, dict_t *params) { if (trace_fop_names[GF_FOP_MKDIR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s mode=%d", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, mode); @@ -1539,7 +1539,7 @@ int trace_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc) { if (trace_fop_names[GF_FOP_UNLINK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path); @@ -1558,7 +1558,7 @@ int trace_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags) { if (trace_fop_names[GF_FOP_RMDIR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s flags=%d", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, flags); @@ -1579,7 +1579,7 @@ trace_symlink (call_frame_t *frame, xlator_t *this, const char *linkpath, loc_t *loc, dict_t *params) { if (trace_fop_names[GF_FOP_SYMLINK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s linkpath=%s, path=%s", frame->root->unique, uuid_utoa (loc->inode->gfid), linkpath, loc->path); @@ -1608,7 +1608,7 @@ trace_rename (call_frame_t *frame, xlator_t *this, loc_t *oldloc, loc_t *newloc) uuid_utoa_r (oldloc->inode->gfid, oldgfid); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": oldgfid=%s oldpath=%s --> newgfid=%s newpath=%s", frame->root->unique, oldgfid, oldloc->path, newgfid, newloc->path); @@ -1638,7 +1638,7 @@ trace_link (call_frame_t *frame, xlator_t *this, loc_t *oldloc, loc_t *newloc) uuid_utoa_r (oldloc->inode->gfid, oldgfid); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": oldgfid=%s oldpath=%s --> newgfid=%s newpath=%s", frame->root->unique, oldgfid, oldloc->path, newgfid, newloc->path); @@ -1663,14 +1663,14 @@ trace_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, if (trace_fop_names[GF_FOP_SETATTR].enabled) { if (valid & GF_SET_ATTR_MODE) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s mode=%o)", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, st_mode_from_ia (stbuf->ia_prot, stbuf->ia_type)); } if (valid & (GF_SET_ATTR_UID | GF_SET_ATTR_GID)) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s uid=%o, gid=%o", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, stbuf->ia_uid, stbuf->ia_gid); @@ -1685,7 +1685,7 @@ trace_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, strftime (modtime_str, 256, "[%b %d %H:%M:%S]", localtime ((time_t *)&ia_time)); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s ia_atime=%s, ia_mtime=%s", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, actime_str, modtime_str); @@ -1712,14 +1712,14 @@ trace_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd, if (trace_fop_names[GF_FOP_FSETATTR].enabled) { if (valid & GF_SET_ATTR_MODE) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p, mode=%o", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, st_mode_from_ia (stbuf->ia_prot, stbuf->ia_type)); } if (valid & (GF_SET_ATTR_UID | GF_SET_ATTR_GID)) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p, uid=%o, gid=%o", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, stbuf->ia_uid, stbuf->ia_gid); @@ -1734,7 +1734,7 @@ trace_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd, strftime (modtime_str, 256, "[%b %d %H:%M:%S]", localtime ((time_t *)&ia_time)); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p ia_atime=%s, ia_mtime=%s", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, actime_str, modtime_str); @@ -1756,7 +1756,7 @@ trace_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset) { if (trace_fop_names[GF_FOP_TRUNCATE].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s, offset=%"PRId64"", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, offset); @@ -1777,7 +1777,7 @@ trace_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, fd_t *fd, int32_t wbflags) { if (trace_fop_names[GF_FOP_OPEN].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s flags=%d fd=%p wbflags=%d", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, flags, fd, wbflags); @@ -1797,7 +1797,7 @@ trace_create (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, mode_t mode, fd_t *fd, dict_t *params) { if (trace_fop_names[GF_FOP_CREATE].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s, fd=%p, flags=0%o mode=0%o", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, fd, flags, mode); @@ -1816,7 +1816,7 @@ trace_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, off_t offset) { if (trace_fop_names[GF_FOP_READ].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p, size=%"GF_PRI_SIZET", offset=%"PRId64")", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, size, offset); frame->local = fd->inode->gfid; @@ -1836,7 +1836,7 @@ trace_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, struct iobref *iobref) { if (trace_fop_names[GF_FOP_WRITE].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p, count=%d, offset=%"PRId64")", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, count, offset); @@ -1855,7 +1855,7 @@ int trace_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc) { if (trace_fop_names[GF_FOP_STATFS].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s", frame->root->unique, (loc->inode)? uuid_utoa (loc->inode->gfid):"0", loc->path); @@ -1873,7 +1873,7 @@ int trace_flush (call_frame_t *frame, xlator_t *this, fd_t *fd) { if (trace_fop_names[GF_FOP_FLUSH].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p", frame->root->unique, uuid_utoa (fd->inode->gfid), fd); frame->local = fd->inode->gfid; @@ -1891,7 +1891,7 @@ int trace_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags) { if (trace_fop_names[GF_FOP_FSYNC].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s flags=%d fd=%p", frame->root->unique, uuid_utoa (fd->inode->gfid), flags, fd); frame->local = fd->inode->gfid; @@ -1910,7 +1910,7 @@ trace_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict, int32_t flags) { if (trace_fop_names[GF_FOP_SETXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s flags=%d", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, flags); @@ -1930,7 +1930,7 @@ trace_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, const char *name) { if (trace_fop_names[GF_FOP_GETXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s name=%s", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, name); @@ -1950,7 +1950,7 @@ trace_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc, const char *name) { if (trace_fop_names[GF_FOP_REMOVEXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s name=%s", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, name); @@ -1970,7 +1970,7 @@ int trace_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd) { if (trace_fop_names[GF_FOP_OPENDIR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s fd=%p", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, fd); @@ -1989,7 +1989,7 @@ trace_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, off_t offset) { if (trace_fop_names[GF_FOP_READDIRP].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p, size=%"GF_PRI_SIZET", offset=%"PRId64, frame->root->unique, uuid_utoa (fd->inode->gfid), fd, size, offset); @@ -2010,7 +2010,7 @@ trace_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, off_t offset) { if (trace_fop_names[GF_FOP_READDIR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p, size=%"GF_PRI_SIZET", offset=%"PRId64, frame->root->unique, uuid_utoa (fd->inode->gfid), fd, size, offset); @@ -2031,7 +2031,7 @@ trace_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t datasync) { if (trace_fop_names[GF_FOP_FSYNCDIR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s datasync=%d fd=%p", frame->root->unique, uuid_utoa (fd->inode->gfid), datasync, fd); @@ -2050,7 +2050,7 @@ int trace_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask) { if (trace_fop_names[GF_FOP_ACCESS].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s path=%s mask=0%o", frame->root->unique, uuid_utoa (loc->inode->gfid), loc->path, mask); @@ -2070,7 +2070,7 @@ trace_rchecksum (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, int32_t len) { if (trace_fop_names[GF_FOP_RCHECKSUM].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s offset=%"PRId64" len=%u fd=%p", frame->root->unique, uuid_utoa (fd->inode->gfid), offset, len, fd); @@ -2092,7 +2092,7 @@ trace_fentrylk (call_frame_t *frame, xlator_t *this, const char *volume, entrylk_type type) { if (trace_fop_names[GF_FOP_FENTRYLK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s volume=%s, (fd=%p basename=%s, " "cmd=%s, type=%s)", frame->root->unique, uuid_utoa (fd->inode->gfid), @@ -2115,7 +2115,7 @@ trace_fgetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, const char *name) { if (trace_fop_names[GF_FOP_FGETXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p name=%s", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, name); @@ -2134,7 +2134,7 @@ trace_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *dict, int32_t flags) { if (trace_fop_names[GF_FOP_FSETXATTR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p flags=%d", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, flags); @@ -2153,7 +2153,7 @@ trace_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset) { if (trace_fop_names[GF_FOP_FTRUNCATE].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s offset=%"PRId64" fd=%p", frame->root->unique, uuid_utoa (fd->inode->gfid), offset, fd); @@ -2173,7 +2173,7 @@ int trace_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd) { if (trace_fop_names[GF_FOP_FSTAT].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p", frame->root->unique, uuid_utoa (fd->inode->gfid), fd); frame->local = fd->inode->gfid; @@ -2192,7 +2192,7 @@ trace_lk (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd, struct gf_flock *lock) { if (trace_fop_names[GF_FOP_LK].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%"PRId64": gfid=%s fd=%p, cmd=%d, lock {l_type=%d, l_whence=%d, " "l_start=%"PRId64", l_len=%"PRId64", l_pid=%u})", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, @@ -2214,7 +2214,7 @@ trace_forget (xlator_t *this, inode_t *inode) /* If user want to understand when a lookup happens, he should know about 'forget' too */ if (trace_fop_names[GF_FOP_LOOKUP].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "gfid=%s ino=%"PRIu64, uuid_utoa (inode->gfid), inode->ino); } @@ -2226,7 +2226,7 @@ int32_t trace_releasedir (xlator_t *this, fd_t *fd) { if (trace_fop_names[GF_FOP_OPENDIR].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "gfid=%s fd=%p", uuid_utoa (fd->inode->gfid), fd); } @@ -2238,7 +2238,7 @@ trace_release (xlator_t *this, fd_t *fd) { if (trace_fop_names[GF_FOP_OPEN].enabled || trace_fop_names[GF_FOP_CREATE].enabled) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "gfid=%s fd=%p", uuid_utoa (fd->inode->gfid), fd); } return 0; @@ -2335,8 +2335,8 @@ init (xlator_t *this) if (!forced_loglevel) goto setloglevel; - if (strcmp (forced_loglevel, "NORMAL") == 0) - trace_log_level = GF_LOG_NORMAL; + if (strcmp (forced_loglevel, "INFO") == 0) + trace_log_level = GF_LOG_INFO; else if (strcmp (forced_loglevel, "TRACE") == 0) trace_log_level = GF_LOG_TRACE; else if (strcmp (forced_loglevel, "ERROR") == 0) @@ -2363,7 +2363,7 @@ fini (xlator_t *this) if (!this) return; - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "trace translator unloaded"); return; } diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c index 52667ade0..a2c6245d6 100644 --- a/xlators/features/locks/src/common.c +++ b/xlators/features/locks/src/common.c @@ -264,7 +264,7 @@ pl_trace_in (xlator_t *this, call_frame_t *frame, fd_t *fd, loc_t *loc, else pl_print_lock (pl_lock, 256, cmd, flock, frame->root->lk_owner); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[REQUEST] Locker = {%s} Lockee = {%s} Lock = {%s}", pl_locker, pl_lockee, pl_lock); } @@ -316,7 +316,7 @@ pl_trace_out (xlator_t *this, call_frame_t *frame, fd_t *fd, loc_t *loc, pl_print_verdict (verdict, 32, op_ret, op_errno); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[%s] Locker = {%s} Lockee = {%s} Lock = {%s}", verdict, pl_locker, pl_lockee, pl_lock); } @@ -344,7 +344,7 @@ pl_trace_block (xlator_t *this, call_frame_t *frame, fd_t *fd, loc_t *loc, else pl_print_lock (pl_lock, 256, cmd, flock, frame->root->lk_owner); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[BLOCKED] Locker = {%s} Lockee = {%s} Lock = {%s}", pl_locker, pl_lockee, pl_lock); } @@ -371,7 +371,7 @@ pl_trace_flush (xlator_t *this, call_frame_t *frame, fd_t *fd) pl_print_locker (pl_locker, 256, this, frame); pl_print_lockee (pl_lockee, 256, fd, NULL); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[FLUSH] Locker = {%s} Lockee = {%s}", pl_locker, pl_lockee); } @@ -389,7 +389,7 @@ pl_trace_release (xlator_t *this, fd_t *fd) pl_print_lockee (pl_lockee, 256, fd, NULL); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[RELEASE] Lockee = {%s}", pl_lockee); } diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index e6a876629..e58c1a2c3 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -213,7 +213,7 @@ entrylk_trace_in (xlator_t *this, call_frame_t *frame, const char *domain, pl_print_lockee (pl_lockee, 256, fd, loc); pl_print_entrylk (pl_entrylk, 256, cmd, type, basename, domain); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[REQUEST] Locker = {%s} Lockee = {%s} Lock = {%s}", pl_locker, pl_lockee, pl_entrylk); } @@ -240,7 +240,7 @@ entrylk_trace_out (xlator_t *this, call_frame_t *frame, const char *domain, pl_print_entrylk (pl_entrylk, 256, cmd, type, basename, domain); pl_print_verdict (verdict, 32, op_ret, op_errno); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[%s] Locker = {%s} Lockee = {%s} Lock = {%s}", verdict, pl_locker, pl_lockee, pl_entrylk); } @@ -266,7 +266,7 @@ entrylk_trace_block (xlator_t *this, call_frame_t *frame, const char *volume, pl_print_lockee (pl_lockee, 256, fd, loc); pl_print_entrylk (pl_entrylk, 256, cmd, type, basename, volume); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "[BLOCKED] Locker = {%s} Lockee = {%s} Lock = {%s}", pl_locker, pl_lockee, pl_entrylk); } diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c index b27f10229..c34593c71 100644 --- a/xlators/features/trash/src/trash.c +++ b/xlators/features/trash/src/trash.c @@ -1458,7 +1458,7 @@ init (xlator_t *this) data = dict_get (this->options, "trash-dir"); if (!data) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "no option specified for 'trash-dir', " "using \"/.trashcan/\""); _priv->trash_dir = gf_strdup ("/.trashcan"); diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index f6b0ddf9a..0a43ef9b6 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -375,7 +375,7 @@ glusterd_friend_find (uuid_t uuid, char *hostname, ret = glusterd_friend_find_by_uuid (uuid, peerinfo); if (ret) { - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Unable to find peer by uuid"); } else { goto out; @@ -387,7 +387,7 @@ glusterd_friend_find (uuid_t uuid, char *hostname, ret = glusterd_friend_find_by_hostname (hostname, peerinfo); if (ret) { - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Unable to find hostname: %s", hostname); } else { goto out; @@ -417,7 +417,7 @@ glusterd_op_txn_begin () } locked = 1; - gf_log ("glusterd", GF_LOG_NORMAL, "Acquired local lock"); + gf_log ("glusterd", GF_LOG_INFO, "Acquired local lock"); ret = glusterd_op_sm_inject_event (GD_OP_EVENT_START_LOCK, NULL); @@ -444,7 +444,7 @@ glusterd_handle_cluster_lock (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received LOCK from uuid: %s", uuid_utoa (lock_req.uuid)); @@ -484,7 +484,7 @@ glusterd_req_ctx_create (rpcsvc_request_t *rpc_req, char *dup_volname = NULL; uuid_unparse (uuid, str); - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received op from uuid: %s", str); dict = dict_new (); @@ -619,7 +619,7 @@ glusterd_handle_cli_probe (rpcsvc_request_t *req) gf_cmd_log ("peer probe", " on host %s:%d", cli_req.hostname, cli_req.port); - gf_log ("glusterd", GF_LOG_NORMAL, "Received CLI probe req %s %d", + gf_log ("glusterd", GF_LOG_INFO, "Received CLI probe req %s %d", cli_req.hostname, cli_req.port); if (!(ret = glusterd_is_local_addr(cli_req.hostname))) { @@ -683,7 +683,7 @@ glusterd_handle_cli_deprobe (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received CLI deprobe req"); + gf_log ("glusterd", GF_LOG_INFO, "Received CLI deprobe req"); ret = glusterd_hostname_to_uuid (cli_req.hostname, uuid); if (ret) { @@ -747,7 +747,7 @@ glusterd_handle_cli_list_friends (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received cli list req"); + gf_log ("glusterd", GF_LOG_INFO, "Received cli list req"); if (cli_req.dict.dict_len) { /* Unserialize the dictionary */ @@ -793,7 +793,7 @@ glusterd_handle_cli_get_volume (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received get vol req"); + gf_log ("glusterd", GF_LOG_INFO, "Received get vol req"); if (cli_req.dict.dict_len) { /* Unserialize the dictionary */ @@ -897,7 +897,7 @@ glusterd_handle_create_volume (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received create volume req"); + gf_log ("glusterd", GF_LOG_INFO, "Received create volume req"); if (cli_req.bricks.bricks_len) { /* Unserialize the dictionary */ @@ -1074,7 +1074,7 @@ glusterd_handle_cli_start_volume (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received start vol req" + gf_log ("glusterd", GF_LOG_INFO, "Received start vol req" "for volume %s", cli_req.volname); dict = dict_new (); @@ -1146,7 +1146,7 @@ glusterd_handle_cli_stop_volume (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received stop vol req" + gf_log ("glusterd", GF_LOG_INFO, "Received stop vol req" "for volume %s", cli_req.volname); dict = dict_new (); @@ -1216,7 +1216,7 @@ glusterd_handle_cli_delete_volume (rpcsvc_request_t *req) } gf_cmd_log ("Volume delete","on volname: %s attempted", cli_req.volname); - gf_log ("glusterd", GF_LOG_NORMAL, "Received delete vol req" + gf_log ("glusterd", GF_LOG_INFO, "Received delete vol req" "for volume %s", cli_req.volname); @@ -1302,7 +1302,7 @@ glusterd_handle_add_brick (rpcsvc_request_t *req) gf_cmd_log ("Volume add-brick", "on volname: %s attempted", cli_req.volname); - gf_log ("glusterd", GF_LOG_NORMAL, "Received add brick req"); + gf_log ("glusterd", GF_LOG_INFO, "Received add brick req"); if (cli_req.bricks.bricks_len) { /* Unserialize the dictionary */ @@ -1498,7 +1498,7 @@ glusterd_handle_replace_brick (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received replace brick req"); + gf_log ("glusterd", GF_LOG_INFO, "Received replace brick req"); if (cli_req.bricks.bricks_len) { /* Unserialize the dictionary */ @@ -1560,7 +1560,7 @@ glusterd_handle_replace_brick (rpcsvc_request_t *req) break; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received replace brick %s request", operation); + gf_log ("glusterd", GF_LOG_INFO, "Received replace brick %s request", operation); gf_cmd_log ("Volume replace-brick","volname: %s src_brick:%s" " dst_brick:%s op:%s",cli_req.volname, src_brick, dst_brick ,operation); @@ -1877,7 +1877,7 @@ glusterd_handle_remove_brick (rpcsvc_request_t *req) } gf_cmd_log ("Volume remove-brick","on volname: %s attempted",cli_req.volname); - gf_log ("glusterd", GF_LOG_NORMAL, "Received rem brick req"); + gf_log ("glusterd", GF_LOG_INFO, "Received rem brick req"); if (cli_req.bricks.bricks_len) { /* Unserialize the dictionary */ @@ -1977,7 +1977,7 @@ glusterd_handle_remove_brick (rpcsvc_request_t *req) if ((!strcmp (tmp->hostname,brickinfo->hostname)) && !strcmp (tmp->path, brickinfo->path)) { - gf_log ("", GF_LOG_NORMAL, "Found brick"); + gf_log ("", GF_LOG_INFO, "Found brick"); if (!sub_volume && volinfo->sub_count) { sub_volume = (pos / volinfo-> sub_count) + 1; @@ -2066,7 +2066,7 @@ glusterd_handle_log_filename (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received log filename req " + gf_log ("glusterd", GF_LOG_INFO, "Received log filename req " "for volume %s", cli_req.volname); dict = dict_new (); @@ -2138,7 +2138,7 @@ glusterd_handle_log_locate (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received log locate req " + gf_log ("glusterd", GF_LOG_INFO, "Received log locate req " "for volume %s", cli_req.volname); if (strchr (cli_req.brick, ':')) { @@ -2247,7 +2247,7 @@ glusterd_handle_log_rotate (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received log rotate req " + gf_log ("glusterd", GF_LOG_INFO, "Received log rotate req " "for volume %s", cli_req.volname); dict = dict_new (); @@ -2315,7 +2315,7 @@ glusterd_handle_sync_volume (rpcsvc_request_t *req) req->rpc_err = GARBAGE_ARGS; goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received volume sync req " + gf_log ("glusterd", GF_LOG_INFO, "Received volume sync req " "for volume %s", (cli_req.flags & GF_CLI_SYNC_ALL) ? "all" : cli_req.volname); @@ -2501,7 +2501,7 @@ glusterd_op_lock_send_resp (rpcsvc_request_t *req, int32_t status) ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, gd_xdr_serialize_mgmt_cluster_lock_rsp); - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Responded, ret: %d", ret); return 0; @@ -2521,7 +2521,7 @@ glusterd_op_unlock_send_resp (rpcsvc_request_t *req, int32_t status) ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, gd_xdr_serialize_mgmt_cluster_unlock_rsp); - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Responded to unlock, ret: %d", ret); return ret; @@ -2543,7 +2543,7 @@ glusterd_handle_cluster_unlock (rpcsvc_request_t *req) } - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received UNLOCK from uuid: %s", uuid_utoa (unlock_req.uuid)); ctx = GF_CALLOC (1, sizeof (*ctx), gf_gld_mt_op_lock_ctx_t); @@ -2593,7 +2593,7 @@ glusterd_op_stage_send_resp (rpcsvc_request_t *req, ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, gd_xdr_serialize_mgmt_stage_op_rsp); - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Responded to stage, ret: %d", ret); if (rsp.dict.dict_val) GF_FREE (rsp.dict.dict_val); @@ -2632,7 +2632,7 @@ glusterd_op_commit_send_resp (rpcsvc_request_t *req, ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, gd_xdr_serialize_mgmt_commit_op_rsp); - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Responded to commit, ret: %d", ret); out: @@ -2655,7 +2655,7 @@ glusterd_handle_incoming_friend_req (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received probe from uuid: %s", uuid_utoa (friend_req.uuid)); ret = glusterd_handle_friend_req (req, friend_req.uuid, friend_req.hostname, friend_req.port, @@ -2693,7 +2693,7 @@ glusterd_handle_incoming_unfriend_req (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received unfriend from uuid: %s", uuid_utoa (friend_req.uuid)); ret = glusterd_remote_hostname_get (req, remote_hostname, @@ -2802,7 +2802,7 @@ glusterd_handle_friend_update (rpcsvc_request_t *req) "from unknown peer %s", uuid_utoa (friend_req.uuid)); goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received friend update from uuid: %s", uuid_utoa (friend_req.uuid)); if (friend_req.friends.friends_len) { @@ -2847,11 +2847,11 @@ glusterd_handle_friend_update (rpcsvc_request_t *req) if (ret) goto out; - gf_log ("", GF_LOG_NORMAL, "Received uuid: %s, hostname:%s", + gf_log ("", GF_LOG_INFO, "Received uuid: %s, hostname:%s", uuid_buf, hostname); if (!uuid_compare (uuid, priv->uuid)) { - gf_log ("", GF_LOG_NORMAL, "Received my uuid as Friend"); + gf_log ("", GF_LOG_INFO, "Received my uuid as Friend"); i++; continue; } @@ -2923,7 +2923,7 @@ glusterd_handle_probe_query (rpcsvc_request_t *req) else port = GF_DEFAULT_BASE_PORT; - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received probe from uuid: %s", uuid_utoa (probe_req.uuid)); ret = glusterd_remote_hostname_get (req, remote_hostname, @@ -2937,7 +2937,7 @@ glusterd_handle_probe_query (rpcsvc_request_t *req) rsp.op_ret = -1; rsp.op_errno = GF_PROBE_ANOTHER_CLUSTER; } else if (ret) { - gf_log ("glusterd", GF_LOG_NORMAL, "Unable to find peerinfo" + gf_log ("glusterd", GF_LOG_INFO, "Unable to find peerinfo" " for host: %s (%d)", remote_hostname, port); args.mode = GD_MODE_ON; ret = glusterd_friend_add (remote_hostname, port, @@ -2957,7 +2957,7 @@ glusterd_handle_probe_query (rpcsvc_request_t *req) ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, gd_xdr_serialize_mgmt_probe_rsp); - gf_log ("glusterd", GF_LOG_NORMAL, "Responded to %s, op_ret: %d, " + gf_log ("glusterd", GF_LOG_INFO, "Responded to %s, op_ret: %d, " "op_errno: %d, ret: %d", probe_req.hostname, rsp.op_ret, rsp.op_errno, ret); @@ -3000,7 +3000,7 @@ glusterd_handle_cli_profile_volume (rpcsvc_request_t *req) goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received volume profile req " + gf_log ("glusterd", GF_LOG_INFO, "Received volume profile req " "for volume %s", cli_req.volname); dict = dict_new (); @@ -3225,7 +3225,7 @@ out: } } - gf_log ("glusterd", GF_LOG_NORMAL, "connect returned %d", ret); + gf_log ("glusterd", GF_LOG_INFO, "connect returned %d", ret); return ret; } @@ -3242,7 +3242,7 @@ glusterd_probe_begin (rpcsvc_request_t *req, const char *hoststr, int port) ret = glusterd_friend_find (NULL, (char *)hoststr, &peerinfo); if (ret) { - gf_log ("glusterd", GF_LOG_NORMAL, "Unable to find peerinfo" + gf_log ("glusterd", GF_LOG_INFO, "Unable to find peerinfo" " for host: %s (%d)", hoststr, port); args.mode = GD_MODE_ON; args.req = req; @@ -3293,7 +3293,7 @@ glusterd_deprobe_begin (rpcsvc_request_t *req, const char *hoststr, int port, ret = glusterd_friend_find (uuid, (char *)hoststr, &peerinfo); if (ret) { - gf_log ("glusterd", GF_LOG_NORMAL, "Unable to find peerinfo" + gf_log ("glusterd", GF_LOG_INFO, "Unable to find peerinfo" " for host: %s %d", hoststr, port); goto out; } @@ -3361,7 +3361,7 @@ glusterd_xfer_friend_remove_resp (rpcsvc_request_t *req, char *hostname, int por ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, gd_xdr_serialize_mgmt_friend_rsp); - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Responded to %s (%d), ret: %d", hostname, port, ret); return ret; } @@ -3392,7 +3392,7 @@ glusterd_xfer_friend_add_resp (rpcsvc_request_t *req, char *hostname, int port, ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, gd_xdr_serialize_mgmt_friend_rsp); - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Responded to %s (%d), ret: %d", hostname, port, ret); if (rsp.hostname) GF_FREE (rsp.hostname) @@ -3416,7 +3416,7 @@ glusterd_xfer_cli_probe_resp (rpcsvc_request_t *req, int32_t op_ret, ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, gf_xdr_serialize_cli_probe_rsp); - gf_log ("glusterd", GF_LOG_NORMAL, "Responded to CLI, ret: %d",ret); + gf_log ("glusterd", GF_LOG_INFO, "Responded to CLI, ret: %d",ret); return ret; } @@ -3437,7 +3437,7 @@ glusterd_xfer_cli_deprobe_resp (rpcsvc_request_t *req, int32_t op_ret, ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, gf_xdr_serialize_cli_deprobe_rsp); - gf_log ("glusterd", GF_LOG_NORMAL, "Responded to CLI, ret: %d",ret); + gf_log ("glusterd", GF_LOG_INFO, "Responded to CLI, ret: %d",ret); return ret; } diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 3253c4f82..9eb39bebe 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -2884,7 +2884,7 @@ rb_do_operation_pause (glusterd_volinfo_t *volinfo, { int ret = -1; - gf_log ("", GF_LOG_NORMAL, + gf_log ("", GF_LOG_INFO, "replace-brick send pause xattr"); ret = rb_spawn_maintenance_client (volinfo, src_brickinfo); @@ -3144,7 +3144,7 @@ rb_update_srcbrick_port (glusterd_brickinfo_t *src_brickinfo, dict_t *rsp_dict, } if (!glusterd_is_local_addr (src_brickinfo->hostname)) { - gf_log ("", GF_LOG_NORMAL, + gf_log ("", GF_LOG_INFO, "adding src-brick port no"); src_brickinfo->port = pmap_registry_search (this, @@ -3201,7 +3201,7 @@ rb_update_dstbrick_port (glusterd_brickinfo_t *dst_brickinfo, dict_t *rsp_dict, } if (!glusterd_is_local_addr (dst_brickinfo->hostname)) { - gf_log ("", GF_LOG_NORMAL, + gf_log ("", GF_LOG_INFO, "adding dst-brick port no"); if (rsp_dict) { @@ -3326,7 +3326,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict) case GF_REPLACE_OP_START: { if (!glusterd_is_local_addr (dst_brickinfo->hostname)) { - gf_log ("", GF_LOG_NORMAL, + gf_log ("", GF_LOG_INFO, "I AM THE DESTINATION HOST"); if (!glusterd_is_rb_paused (volinfo)) { ret = rb_spawn_destination_brick (volinfo, dst_brickinfo); @@ -3353,7 +3353,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict) } if (!glusterd_is_local_addr (dst_brickinfo->hostname)) { - gf_log ("", GF_LOG_NORMAL, + gf_log ("", GF_LOG_INFO, "adding dst-brick port no"); ret = rb_update_dstbrick_port (dst_brickinfo, rsp_dict, @@ -3376,7 +3376,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict) if (!glusterd_is_local_addr (dst_brickinfo->hostname) && replace_op != GF_REPLACE_OP_COMMIT_FORCE) { - gf_log ("", GF_LOG_NORMAL, + gf_log ("", GF_LOG_INFO, "I AM THE DESTINATION HOST"); ret = rb_kill_destination_brick (volinfo, dst_brickinfo); if (ret) { @@ -3458,7 +3458,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict) } if (!glusterd_is_local_addr (dst_brickinfo->hostname)) { - gf_log ("", GF_LOG_NORMAL, + gf_log ("", GF_LOG_INFO, "I AM THE DESTINATION HOST"); ret = rb_kill_destination_brick (volinfo, dst_brickinfo); if (ret) { @@ -5791,7 +5791,7 @@ out: opinfo.op_ret = ret; } - gf_log ("glusterd", GF_LOG_NORMAL, "Sent op req to %d peers", + gf_log ("glusterd", GF_LOG_INFO, "Sent op req to %d peers", opinfo.pending_count); if (!opinfo.pending_count) @@ -5908,7 +5908,7 @@ glusterd_op_ac_send_commit_op (glusterd_op_sm_event_t *event, void *ctx) } opinfo.pending_count = pending_count; - gf_log ("glusterd", GF_LOG_NORMAL, "Sent op req to %d peers", + gf_log ("glusterd", GF_LOG_INFO, "Sent op req to %d peers", opinfo.pending_count); out: if (dict) @@ -6326,7 +6326,7 @@ glusterd_op_txn_complete () goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, "Cleared local lock"); + gf_log ("glusterd", GF_LOG_INFO, "Cleared local lock"); op_ret = opinfo.op_ret; op_errno = opinfo.op_errno; diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index a3556c19e..d5048549b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -332,7 +332,7 @@ glusterd_defrag_start (void *data) out: volinfo->defrag = NULL; if (defrag) { - gf_log ("rebalance", GF_LOG_NORMAL, "rebalance on %s complete", + gf_log ("rebalance", GF_LOG_INFO, "rebalance on %s complete", defrag->mount); snprintf (cmd_str, 1024, "umount -l %s", defrag->mount); @@ -474,7 +474,7 @@ glusterd_rebalance_cmd_attempted_log (int cmd, char *volname) break; } - gf_log ("glusterd", GF_LOG_NORMAL, "Received rebalance volume %d on %s", + gf_log ("glusterd", GF_LOG_INFO, "Received rebalance volume %d on %s", cmd, volname); } diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c index 056378749..2b0f87fb0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c @@ -430,7 +430,7 @@ glusterd3_1_probe_cbk (struct rpc_req *req, struct iovec *iov, goto out; } - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received probe resp from uuid: %s, host: %s", uuid_utoa (rsp.uuid), rsp.hostname); if (rsp.op_ret != 0) { @@ -477,7 +477,7 @@ glusterd3_1_probe_cbk (struct rpc_req *req, struct iovec *iov, glusterd_op_sm (); } - gf_log ("glusterd", GF_LOG_NORMAL, "Received resp to probe req"); + gf_log ("glusterd", GF_LOG_INFO, "Received resp to probe req"); out: if (rsp.hostname) @@ -520,7 +520,7 @@ glusterd3_1_friend_add_cbk (struct rpc_req * req, struct iovec *iov, op_ret = rsp.op_ret; op_errno = rsp.op_errno; - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received %s from uuid: %s, host: %s, port: %d", (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid), rsp.hostname, rsp.port); @@ -620,7 +620,7 @@ glusterd3_1_friend_remove_cbk (struct rpc_req * req, struct iovec *iov, op_ret = rsp.op_ret; op_errno = rsp.op_errno; - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received %s from uuid: %s, host: %s, port: %d", (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid), rsp.hostname, rsp.port); @@ -702,7 +702,7 @@ glusterd3_1_friend_update_cbk (struct rpc_req *req, struct iovec *iov, op_ret = rsp.op_ret; */ - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received %s from uuid: %s", (op_ret)?"RJT":"ACC", str); @@ -739,7 +739,7 @@ glusterd3_1_cluster_lock_cbk (struct rpc_req *req, struct iovec *iov, op_ret = rsp.op_ret; - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received %s from uuid: %s", (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid)); @@ -798,7 +798,7 @@ glusterd3_1_cluster_unlock_cbk (struct rpc_req *req, struct iovec *iov, op_ret = rsp.op_ret; - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received %s from uuid: %s", (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid)); @@ -936,7 +936,7 @@ glusterd3_1_stage_op_cbk (struct rpc_req *req, struct iovec *iov, op_ret = rsp.op_ret; - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received %s from uuid: %s", (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid)); @@ -1122,7 +1122,7 @@ glusterd3_1_commit_op_cbk (struct rpc_req *req, struct iovec *iov, op_ret = rsp.op_ret; - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Received %s from uuid: %s", (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid)); diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c index ce15ffdfc..94e7ca08a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-sm.c @@ -488,7 +488,7 @@ glusterd_ac_send_friend_update (glusterd_friend_sm_event_t *event, void *ctx) ret = dict_set_str (friends, key, peerinfo->hostname); if (ret) goto out; - gf_log ("", GF_LOG_NORMAL, "Added uuid: %s, host: %s", + gf_log ("", GF_LOG_INFO, "Added uuid: %s, host: %s", dup_buf, peerinfo->hostname); } diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index e1db5f454..8058adcd0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -762,11 +762,11 @@ glusterd_store_delete_volume (glusterd_volinfo_t *volinfo) else ret = unlink (path); - gf_log ("", GF_LOG_NORMAL, "%s %s", + gf_log ("", GF_LOG_INFO, "%s %s", ret?"Failed to remove":"Removed", entry->d_name); if (ret) - gf_log ("", GF_LOG_NORMAL, "errno:%d", errno); + gf_log ("", GF_LOG_INFO, "errno:%d", errno); stat_failed: memset (path, 0, sizeof(path)); glusterd_for_each_entry (entry, dir); @@ -1058,7 +1058,7 @@ glusterd_retrieve_uuid () &uuid_str); if (ret) { - gf_log ("", GF_LOG_NORMAL, "No previous uuid is present"); + gf_log ("", GF_LOG_INFO, "No previous uuid is present"); goto out; } diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index c4e555e8a..e8d107db7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -239,7 +239,7 @@ glusterd_lock (uuid_t uuid) ret = glusterd_set_lock_owner (uuid); if (!ret) { - gf_log ("glusterd", GF_LOG_NORMAL, "Cluster lock held by" + gf_log ("glusterd", GF_LOG_INFO, "Cluster lock held by" " %s", uuid_utoa (uuid)); } @@ -703,7 +703,7 @@ glusterd_volume_brickinfo_get (uuid_t uuid, char *hostname, char *path, } if ((!uuid_compare (peer_uuid, brickiter->uuid)) && !strcmp (brickiter->path, path)) { - gf_log ("", GF_LOG_NORMAL, "Found brick"); + gf_log ("", GF_LOG_INFO, "Found brick"); ret = 0; if (brickinfo) *brickinfo = brickiter; @@ -732,7 +732,7 @@ glusterd_volume_brickinfo_get_by_brick (char *brick, GF_ASSERT (brick); GF_ASSERT (volinfo); - gf_log ("", GF_LOG_NORMAL, "brick: %s", brick); + gf_log ("", GF_LOG_INFO, "brick: %s", brick); dup_brick = gf_strdup (brick); if (!dup_brick) { @@ -859,7 +859,7 @@ glusterd_service_stop (const char *service, char *pidfile, int sig, fclose (file); file = NULL; - gf_log ("", GF_LOG_NORMAL, "Stopping gluster %s running in pid: %d", + gf_log ("", GF_LOG_INFO, "Stopping gluster %s running in pid: %d", service, pid); ret = kill (pid, sig); @@ -1013,7 +1013,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, ret = lockf (fileno (file), F_TLOCK, 0); if (ret && ((EAGAIN == errno) || (EACCES == errno))) { ret = 0; - gf_log ("", GF_LOG_NORMAL, "brick %s:%s " + gf_log ("", GF_LOG_INFO, "brick %s:%s " "already started", brickinfo->hostname, brickinfo->path); goto connect; @@ -1029,7 +1029,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, ret = lockf (fileno (file), F_TLOCK, 0); if (ret && ((EAGAIN == errno) || (EACCES == errno))) { ret = 0; - gf_log ("", GF_LOG_NORMAL, "brick %s:%s " + gf_log ("", GF_LOG_INFO, "brick %s:%s " "already started", brickinfo->hostname, brickinfo->path); goto connect; @@ -1043,7 +1043,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, } unlink (pidfile); - gf_log ("", GF_LOG_NORMAL, "About to start glusterfs" + gf_log ("", GF_LOG_INFO, "About to start glusterfs" " for brick %s:%s", brickinfo->hostname, brickinfo->path); GLUSTERD_REMOVE_SLASH_FROM_PATH (brickinfo->path, exp_path); @@ -2096,17 +2096,17 @@ void glusterd_nfs_pmap_deregister () { if (pmap_unset (MOUNT_PROGRAM, MOUNTV3_VERSION)) - gf_log ("", GF_LOG_NORMAL, "De-registered MOUNTV3 successfully"); + gf_log ("", GF_LOG_INFO, "De-registered MOUNTV3 successfully"); else gf_log ("", GF_LOG_ERROR, "De-register MOUNTV3 is unsuccessful"); if (pmap_unset (MOUNT_PROGRAM, MOUNTV1_VERSION)) - gf_log ("", GF_LOG_NORMAL, "De-registered MOUNTV1 successfully"); + gf_log ("", GF_LOG_INFO, "De-registered MOUNTV1 successfully"); else gf_log ("", GF_LOG_ERROR, "De-register MOUNTV1 is unsuccessful"); if (pmap_unset (NFS_PROGRAM, NFSV3_VERSION)) - gf_log ("", GF_LOG_NORMAL, "De-registered NFSV3 successfully"); + gf_log ("", GF_LOG_INFO, "De-registered NFSV3 successfully"); else gf_log ("", GF_LOG_ERROR, "De-register NFSV3 is unsuccessful"); @@ -2417,7 +2417,7 @@ glusterd_friend_find_by_uuid (uuid_t uuid, list_for_each_entry (entry, &priv->peers, uuid_list) { if (!uuid_compare (entry->uuid, uuid)) { - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Friend found... state: %s", glusterd_friend_sm_state_name_get (entry->state.state)); *peerinfo = entry; @@ -2456,7 +2456,7 @@ glusterd_friend_find_by_hostname (const char *hoststr, if (!strncmp (entry->hostname, hoststr, 1024)) { - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Friend %s found.. state: %d", hoststr, entry->state.state); *peerinfo = entry; @@ -2495,7 +2495,7 @@ glusterd_friend_find_by_hostname (const char *hoststr, if (!strncmp (entry->hostname, host, 1024) || !strncmp (entry->hostname,hname, 1024)) { - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "Friend %s found.. state: %d", hoststr, entry->state.state); *peerinfo = entry; @@ -2574,7 +2574,7 @@ glusterd_brick_stop (glusterd_volinfo_t *volinfo, goto out; } - gf_log ("", GF_LOG_NORMAL, "About to stop glusterfs" + gf_log ("", GF_LOG_INFO, "About to stop glusterfs" " for brick %s:%s", brickinfo->hostname, brickinfo->path); ret = glusterd_volume_stop_glusterfs (volinfo, brickinfo); diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index b4df630d0..e1c338bc3 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -84,7 +84,7 @@ glusterd_uuid_init (int flag) ret = glusterd_retrieve_uuid (); if (!ret) { uuid_copy (glusterd_uuid, priv->uuid); - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "retrieved UUID: %s", uuid_utoa (priv->uuid)); return 0; } @@ -92,7 +92,7 @@ glusterd_uuid_init (int flag) uuid_generate (glusterd_uuid); - gf_log ("glusterd", GF_LOG_NORMAL, + gf_log ("glusterd", GF_LOG_INFO, "generated UUID: %s", uuid_utoa (glusterd_uuid)); uuid_copy (priv->uuid, glusterd_uuid); @@ -345,7 +345,7 @@ init (xlator_t *this) first_time = 1; } - gf_log (this->name, GF_LOG_NORMAL, "Using %s as working directory", + gf_log (this->name, GF_LOG_INFO, "Using %s as working directory", dirname); snprintf (cmd_log_filename, PATH_MAX,"%s/.cmd_log_history", diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index eb0ef9efd..6fa484acb 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -3214,7 +3214,7 @@ fuse_thread_proc (void *data) mount_point = data_to_str (dict_get (this->options, ZR_MOUNTPOINT_OPT)); if (mount_point) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "unmounting %s", mount_point); dict_del (this->options, ZR_MOUNTPOINT_OPT); } @@ -3684,7 +3684,7 @@ fini (xlator_t *this_xl) mount_point = data_to_str (dict_get (this_xl->options, ZR_MOUNTPOINT_OPT)); if (mount_point != NULL) { - gf_log (this_xl->name, GF_LOG_NORMAL, + gf_log (this_xl->name, GF_LOG_INFO, "Unmounting '%s'.", mount_point); dict_del (this_xl->options, ZR_MOUNTPOINT_OPT); diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in index d14c30c80..c805a7cd5 100755 --- a/xlators/mount/fuse/utils/mount.glusterfs.in +++ b/xlators/mount/fuse/utils/mount.glusterfs.in @@ -23,12 +23,12 @@ _init () LOG_CRITICAL=CRITICAL; LOG_ERROR=ERROR; LOG_WARNING=WARNING; - LOG_NORMAL=NORMAL + LOG_INFO=INFO LOG_DEBUG=DEBUG; LOG_TRACE=TRACE; - # set default log level to NORMAL - log_level=$LOG_NORMAL; + # set default log level to INFO + log_level=$LOG_INFO; prefix="@prefix@"; exec_prefix=@exec_prefix@; cmd_line=$(echo "@sbindir@/glusterfs"); @@ -43,8 +43,8 @@ start_glusterfs () "ERROR") log_level=$LOG_ERROR; ;; - "NORMAL") - log_level=$LOG_NORMAL + "INFO") + log_level=$LOG_INFO ;; "DEBUG") log_level=$LOG_DEBUG; @@ -62,8 +62,8 @@ start_glusterfs () log_level=$LOG_NONE; ;; *) - echo "invalid log level $log_level_str, using NORMAL"; - log_level=$LOG_NORMAL; + echo "invalid log level $log_level_str, using INFO"; + log_level=$LOG_INFO; ;; esac fi diff --git a/xlators/mount/fuse/utils/mount_glusterfs.in b/xlators/mount/fuse/utils/mount_glusterfs.in index 473ecace9..d36fdeeda 100755 --- a/xlators/mount/fuse/utils/mount_glusterfs.in +++ b/xlators/mount/fuse/utils/mount_glusterfs.in @@ -25,11 +25,11 @@ _init () LOG_CRITICAL=CRITICAL; LOG_ERROR=ERROR; LOG_WARNING=WARNING; - LOG_NORMAL=NORMAL; + LOG_INFO=INFO; LOG_DEBUG=DEBUG; # set default log level to ERROR - log_level=$LOG_NORMAL; + log_level=$LOG_INFO; } start_glusterfs () @@ -43,8 +43,8 @@ start_glusterfs () "ERROR") log_level=$LOG_ERROR; ;; - "NORMAL") - log_level=$LOG_NORMAL; + "INFO") + log_level=$LOG_INFO; ;; "DEBUG") log_level=$LOG_DEBUG; @@ -59,8 +59,8 @@ start_glusterfs () log_level=$LOG_NONE; ;; *) - echo "invalid log level $log_level_str, using NORMAL"; - log_level=$LOG_NORMAL; + echo "invalid log level $log_level_str, using INFO"; + log_level=$LOG_INFO; ;; esac fi diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c index bb658fd0c..418307c41 100644 --- a/xlators/protocol/client/src/client-handshake.c +++ b/xlators/protocol/client/src/client-handshake.c @@ -530,7 +530,7 @@ client3_1_reopendir_cbk (struct rpc_req *req, struct iovec *iov, int count, "reopendir on %s failed (%s)", local->loc.path, strerror (rsp.op_errno)); } else { - gf_log (frame->this->name, GF_LOG_NORMAL, + gf_log (frame->this->name, GF_LOG_INFO, "reopendir on %s succeeded (fd = %"PRId64")", local->loc.path, rsp.fd); } diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index ee8aecc22..e58f95db0 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -1876,7 +1876,7 @@ client_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event, if (!conf->skip_notify) { if (conf->connected) - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "disconnected"); /* If the CHILD_DOWN event goes to parent xlator diff --git a/xlators/protocol/legacy/client/src/client-protocol.c b/xlators/protocol/legacy/client/src/client-protocol.c index 135c5646f..6a5b14c65 100644 --- a/xlators/protocol/legacy/client/src/client-protocol.c +++ b/xlators/protocol/legacy/client/src/client-protocol.c @@ -5741,7 +5741,7 @@ client_setvolume_cbk (call_frame_t *frame, gf_hdr_common_t *hdr, size_t hdrlen, } - gf_log (trans->xl->name, GF_LOG_NORMAL, + gf_log (trans->xl->name, GF_LOG_INFO, "Connected to %s, attached " "to remote volume '%s'.", trans->peerinfo.identifier, remote_subvol); diff --git a/xlators/protocol/legacy/server/src/server-protocol.c b/xlators/protocol/legacy/server/src/server-protocol.c index 820f3a645..b462a31f1 100644 --- a/xlators/protocol/legacy/server/src/server-protocol.c +++ b/xlators/protocol/legacy/server/src/server-protocol.c @@ -253,7 +253,7 @@ gf_server_print_request (call_frame_t *frame) break; } - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%s%s%s%s%s%s%s", gf_fop_list[frame->root->op], caller, resolve_vars, loc_vars, resolve2_vars, loc2_vars, other_vars); @@ -299,7 +299,7 @@ server_print_reply (call_frame_t *frame, int op_ret, int op_errno) if (state->fd) snprintf (fdstr, 32, " fd=%p", state->fd); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%s%s => (%d, %d)%s", op, caller, op_ret, op_errno, fdstr); } diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index b34f48c09..1abe4d2d8 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -1282,7 +1282,7 @@ server_print_reply (call_frame_t *frame, int op_ret, int op_errno) if (state->fd) snprintf (fdstr, 32, " fd=%p", state->fd); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%s%s => (%d, %d)%s", op, caller, op_ret, op_errno, fdstr); out: @@ -1348,7 +1348,7 @@ server_print_request (call_frame_t *frame) break; } - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "%s%s%s%s%s%s%s", op, caller, resolve_vars, loc_vars, resolve2_vars, loc2_vars, other_vars); diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index c6128cf0d..7f2c9ab1f 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -4526,7 +4526,7 @@ init (xlator_t *this) strerror(errno)); } else { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "Maximum allowed open file descriptors " "set to 65536"); } |