diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-01-22 14:08:45 -0800 | 
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-02-03 17:21:09 -0800 | 
| commit | bbe02d77a5e7fb587787b9bbc06d28ca8419afb3 (patch) | |
| tree | 9c6ae3912828864b62b519b0b5f93bc327fc571f /glusterfsd/src | |
| parent | 8cf2a36dad6c8bac7cd3a05455fd555544ebb457 (diff) | |
mount.glusterfs/glusterfsd: Add dummy deprecated *fetch-attempts options
volfile-max-fetch-attempts and fetch-attempts were not deprecated
properly at 'b610f1be7cd71b8f3e51c224c8b6fe0e7366c8cf'.
Provide a way for backward compatibility for broken third party apps.
Change-Id: I597b50df08823e74691c5a20a4da4d13aab4b7ff
BUG: 1045309
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
Reviewed-on: http://review.gluster.org/6544
Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'glusterfsd/src')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 16 | 
1 files changed, 16 insertions, 0 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 108edc10cf2..098a9169aa4 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -142,6 +142,9 @@ static struct argp_option gf_options[] = {           "Mount the filesystem with POSIX ACL support"},          {"selinux", ARGP_SELINUX_KEY, 0, 0,           "Enable SELinux label (extened attributes) support on inodes"}, +        {"volfile-max-fetch-attempts", ARGP_VOLFILE_MAX_FETCH_ATTEMPTS, "0", +         OPTION_HIDDEN, "Maximum number of attempts to fetch the volfile"}, +  #ifdef GF_LINUX_HOST_OS          {"aux-gfid-mount", ARGP_AUX_GFID_MOUNT_KEY, 0, 0,           "Enable access to filesystem through gfid directly"}, @@ -879,6 +882,9 @@ parse_opts (int key, char *arg, struct argp_state *state)          case ARGP_DEBUG_KEY:                  cmd_args->debug_mode = ENABLE_DEBUG_MODE;                  break; +        case ARGP_VOLFILE_MAX_FETCH_ATTEMPTS: +                cmd_args->max_connect_attempts = 1; +                break;          case ARGP_DIRECT_IO_MODE_KEY:                  if (!arg) @@ -1477,6 +1483,16 @@ parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx)                  }          } +        /* +           This option was made obsolete but parsing it for backward +           compatibility with third party applications +         */ +        if (cmd_args->max_connect_attempts) { +                gf_log ("glusterfs", GF_LOG_WARNING, +                        "obsolete option '--volfile-max-fetch-attempts" +                        " or fetch-attempts' was provided"); +        } +  #ifdef GF_DARWIN_HOST_OS          if (cmd_args->mount_point)                  cmd_args->mac_compat = GF_OPTION_DEFERRED;  | 
