diff options
Diffstat (limited to 'xlators/mgmt/glusterd')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 296 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handshake.c | 48 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c | 36 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-pmap.c | 20 |
4 files changed, 197 insertions, 203 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 0493612d1da..b390f6e65e1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -6359,20 +6359,26 @@ glusterd_null(rpcsvc_request_t *req) return 0; } -rpcsvc_actor_t gd_svc_mgmt_actors[GLUSTERD_MGMT_MAXVALUE] = { - [GLUSTERD_MGMT_NULL] = {"NULL", GLUSTERD_MGMT_NULL, glusterd_null, NULL, 0, - DRC_NA}, - [GLUSTERD_MGMT_CLUSTER_LOCK] = {"CLUSTER_LOCK", GLUSTERD_MGMT_CLUSTER_LOCK, - glusterd_handle_cluster_lock, NULL, 0, - DRC_NA}, +static rpcsvc_actor_t gd_svc_mgmt_actors[GLUSTERD_MGMT_MAXVALUE] = { + [GLUSTERD_MGMT_NULL] = {"NULL", glusterd_null, NULL, GLUSTERD_MGMT_NULL, + DRC_NA, 0}, + [GLUSTERD_MGMT_CLUSTER_LOCK] = {"CLUSTER_LOCK", + glusterd_handle_cluster_lock, NULL, + GLUSTERD_MGMT_CLUSTER_LOCK, DRC_NA, 0}, [GLUSTERD_MGMT_CLUSTER_UNLOCK] = {"CLUSTER_UNLOCK", - GLUSTERD_MGMT_CLUSTER_UNLOCK, - glusterd_handle_cluster_unlock, NULL, 0, - DRC_NA}, - [GLUSTERD_MGMT_STAGE_OP] = {"STAGE_OP", GLUSTERD_MGMT_STAGE_OP, - glusterd_handle_stage_op, NULL, 0, DRC_NA}, - [GLUSTERD_MGMT_COMMIT_OP] = {"COMMIT_OP", GLUSTERD_MGMT_COMMIT_OP, - glusterd_handle_commit_op, NULL, 0, DRC_NA}, + glusterd_handle_cluster_unlock, NULL, + GLUSTERD_MGMT_CLUSTER_UNLOCK, DRC_NA, 0}, + [GLUSTERD_MGMT_STAGE_OP] = {"STAGE_OP", glusterd_handle_stage_op, NULL, + GLUSTERD_MGMT_STAGE_OP, DRC_NA, 0}, + [GLUSTERD_MGMT_COMMIT_OP] = + { + "COMMIT_OP", + glusterd_handle_commit_op, + NULL, + GLUSTERD_MGMT_COMMIT_OP, + DRC_NA, + 0, + }, }; struct rpcsvc_program gd_svc_mgmt_prog = { @@ -6384,19 +6390,18 @@ struct rpcsvc_program gd_svc_mgmt_prog = { .synctask = _gf_true, }; -rpcsvc_actor_t gd_svc_peer_actors[GLUSTERD_FRIEND_MAXVALUE] = { - [GLUSTERD_FRIEND_NULL] = {"NULL", GLUSTERD_MGMT_NULL, glusterd_null, NULL, - 0, DRC_NA}, - [GLUSTERD_PROBE_QUERY] = {"PROBE_QUERY", GLUSTERD_PROBE_QUERY, - glusterd_handle_probe_query, NULL, 0, DRC_NA}, - [GLUSTERD_FRIEND_ADD] = {"FRIEND_ADD", GLUSTERD_FRIEND_ADD, - glusterd_handle_incoming_friend_req, NULL, 0, - DRC_NA}, - [GLUSTERD_FRIEND_REMOVE] = {"FRIEND_REMOVE", GLUSTERD_FRIEND_REMOVE, - glusterd_handle_incoming_unfriend_req, NULL, 0, - DRC_NA}, - [GLUSTERD_FRIEND_UPDATE] = {"FRIEND_UPDATE", GLUSTERD_FRIEND_UPDATE, - glusterd_handle_friend_update, NULL, 0, DRC_NA}, +static rpcsvc_actor_t gd_svc_peer_actors[GLUSTERD_FRIEND_MAXVALUE] = { + [GLUSTERD_FRIEND_NULL] = {"NULL", glusterd_null, NULL, GLUSTERD_MGMT_NULL, + DRC_NA, 0}, + [GLUSTERD_PROBE_QUERY] = {"PROBE_QUERY", glusterd_handle_probe_query, NULL, + GLUSTERD_PROBE_QUERY, DRC_NA, 0}, + [GLUSTERD_FRIEND_ADD] = {"FRIEND_ADD", glusterd_handle_incoming_friend_req, + NULL, GLUSTERD_FRIEND_ADD, DRC_NA, 0}, + [GLUSTERD_FRIEND_REMOVE] = {"FRIEND_REMOVE", + glusterd_handle_incoming_unfriend_req, NULL, + GLUSTERD_FRIEND_REMOVE, DRC_NA, 0}, + [GLUSTERD_FRIEND_UPDATE] = {"FRIEND_UPDATE", glusterd_handle_friend_update, + NULL, GLUSTERD_FRIEND_UPDATE, DRC_NA, 0}, }; struct rpcsvc_program gd_svc_peer_prog = { @@ -6408,118 +6413,109 @@ struct rpcsvc_program gd_svc_peer_prog = { .synctask = _gf_false, }; -rpcsvc_actor_t gd_svc_cli_actors[GLUSTER_CLI_MAXVALUE] = { - [GLUSTER_CLI_PROBE] = {"CLI_PROBE", GLUSTER_CLI_PROBE, - glusterd_handle_cli_probe, NULL, 0, DRC_NA}, +static rpcsvc_actor_t gd_svc_cli_actors[GLUSTER_CLI_MAXVALUE] = { + [GLUSTER_CLI_PROBE] = {"CLI_PROBE", glusterd_handle_cli_probe, NULL, + GLUSTER_CLI_PROBE, DRC_NA, 0}, [GLUSTER_CLI_CREATE_VOLUME] = {"CLI_CREATE_VOLUME", - GLUSTER_CLI_CREATE_VOLUME, - glusterd_handle_create_volume, NULL, 0, - DRC_NA}, + glusterd_handle_create_volume, NULL, + GLUSTER_CLI_CREATE_VOLUME, DRC_NA, 0}, [GLUSTER_CLI_DEFRAG_VOLUME] = {"CLI_DEFRAG_VOLUME", - GLUSTER_CLI_DEFRAG_VOLUME, - glusterd_handle_defrag_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_DEPROBE] = {"FRIEND_REMOVE", GLUSTER_CLI_DEPROBE, - glusterd_handle_cli_deprobe, NULL, 0, DRC_NA}, - [GLUSTER_CLI_LIST_FRIENDS] = {"LIST_FRIENDS", GLUSTER_CLI_LIST_FRIENDS, - glusterd_handle_cli_list_friends, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_UUID_RESET] = {"UUID_RESET", GLUSTER_CLI_UUID_RESET, - glusterd_handle_cli_uuid_reset, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_UUID_GET] = {"UUID_GET", GLUSTER_CLI_UUID_GET, - glusterd_handle_cli_uuid_get, NULL, 0, DRC_NA}, - [GLUSTER_CLI_START_VOLUME] = {"START_VOLUME", GLUSTER_CLI_START_VOLUME, - glusterd_handle_cli_start_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_STOP_VOLUME] = {"STOP_VOLUME", GLUSTER_CLI_STOP_VOLUME, - glusterd_handle_cli_stop_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_DELETE_VOLUME] = {"DELETE_VOLUME", GLUSTER_CLI_DELETE_VOLUME, - glusterd_handle_cli_delete_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_GET_VOLUME] = {"GET_VOLUME", GLUSTER_CLI_GET_VOLUME, - glusterd_handle_cli_get_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_ADD_BRICK] = {"ADD_BRICK", GLUSTER_CLI_ADD_BRICK, - glusterd_handle_add_brick, NULL, 0, DRC_NA}, - [GLUSTER_CLI_ATTACH_TIER] = {"ATTACH_TIER", GLUSTER_CLI_ATTACH_TIER, - glusterd_handle_attach_tier, NULL, 0, DRC_NA}, - [GLUSTER_CLI_REPLACE_BRICK] = {"REPLACE_BRICK", GLUSTER_CLI_REPLACE_BRICK, - glusterd_handle_replace_brick, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_REMOVE_BRICK] = {"REMOVE_BRICK", GLUSTER_CLI_REMOVE_BRICK, - glusterd_handle_remove_brick, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_LOG_ROTATE] = {"LOG FILENAME", GLUSTER_CLI_LOG_ROTATE, - glusterd_handle_log_rotate, NULL, 0, DRC_NA}, - [GLUSTER_CLI_SET_VOLUME] = {"SET_VOLUME", GLUSTER_CLI_SET_VOLUME, - glusterd_handle_set_volume, NULL, 0, DRC_NA}, - [GLUSTER_CLI_SYNC_VOLUME] = {"SYNC_VOLUME", GLUSTER_CLI_SYNC_VOLUME, - glusterd_handle_sync_volume, NULL, 0, DRC_NA}, - [GLUSTER_CLI_RESET_VOLUME] = {"RESET_VOLUME", GLUSTER_CLI_RESET_VOLUME, - glusterd_handle_reset_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_FSM_LOG] = {"FSM_LOG", GLUSTER_CLI_FSM_LOG, - glusterd_handle_fsm_log, NULL, 0, DRC_NA}, - [GLUSTER_CLI_GSYNC_SET] = {"GSYNC_SET", GLUSTER_CLI_GSYNC_SET, - glusterd_handle_gsync_set, NULL, 0, DRC_NA}, - [GLUSTER_CLI_PROFILE_VOLUME] = {"STATS_VOLUME", GLUSTER_CLI_PROFILE_VOLUME, - glusterd_handle_cli_profile_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_QUOTA] = {"QUOTA", GLUSTER_CLI_QUOTA, glusterd_handle_quota, - NULL, 0, DRC_NA}, - [GLUSTER_CLI_GETWD] = {"GETWD", GLUSTER_CLI_GETWD, glusterd_handle_getwd, - NULL, 1, DRC_NA}, - [GLUSTER_CLI_STATUS_VOLUME] = {"STATUS_VOLUME", GLUSTER_CLI_STATUS_VOLUME, - glusterd_handle_status_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_MOUNT] = {"MOUNT", GLUSTER_CLI_MOUNT, glusterd_handle_mount, - NULL, 1, DRC_NA}, - [GLUSTER_CLI_UMOUNT] = {"UMOUNT", GLUSTER_CLI_UMOUNT, - glusterd_handle_umount, NULL, 1, DRC_NA}, - [GLUSTER_CLI_HEAL_VOLUME] = {"HEAL_VOLUME", GLUSTER_CLI_HEAL_VOLUME, - glusterd_handle_cli_heal_volume, NULL, 0, - DRC_NA}, + glusterd_handle_defrag_volume, NULL, + GLUSTER_CLI_DEFRAG_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_DEPROBE] = {"FRIEND_REMOVE", glusterd_handle_cli_deprobe, NULL, + GLUSTER_CLI_DEPROBE, DRC_NA, 0}, + [GLUSTER_CLI_LIST_FRIENDS] = {"LIST_FRIENDS", + glusterd_handle_cli_list_friends, NULL, + GLUSTER_CLI_LIST_FRIENDS, DRC_NA, 0}, + [GLUSTER_CLI_UUID_RESET] = {"UUID_RESET", glusterd_handle_cli_uuid_reset, + NULL, GLUSTER_CLI_UUID_RESET, DRC_NA, 0}, + [GLUSTER_CLI_UUID_GET] = {"UUID_GET", glusterd_handle_cli_uuid_get, NULL, + GLUSTER_CLI_UUID_GET, DRC_NA, 0}, + [GLUSTER_CLI_START_VOLUME] = {"START_VOLUME", + glusterd_handle_cli_start_volume, NULL, + GLUSTER_CLI_START_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_STOP_VOLUME] = {"STOP_VOLUME", glusterd_handle_cli_stop_volume, + NULL, GLUSTER_CLI_STOP_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_DELETE_VOLUME] = {"DELETE_VOLUME", + glusterd_handle_cli_delete_volume, NULL, + GLUSTER_CLI_DELETE_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_GET_VOLUME] = {"GET_VOLUME", glusterd_handle_cli_get_volume, + NULL, GLUSTER_CLI_GET_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_ADD_BRICK] = {"ADD_BRICK", glusterd_handle_add_brick, NULL, + GLUSTER_CLI_ADD_BRICK, DRC_NA, 0}, + [GLUSTER_CLI_ATTACH_TIER] = {"ATTACH_TIER", glusterd_handle_attach_tier, + NULL, GLUSTER_CLI_ATTACH_TIER, DRC_NA, 0}, + [GLUSTER_CLI_REPLACE_BRICK] = {"REPLACE_BRICK", + glusterd_handle_replace_brick, NULL, + GLUSTER_CLI_REPLACE_BRICK, DRC_NA, 0}, + [GLUSTER_CLI_REMOVE_BRICK] = {"REMOVE_BRICK", glusterd_handle_remove_brick, + NULL, GLUSTER_CLI_REMOVE_BRICK, DRC_NA, 0}, + [GLUSTER_CLI_LOG_ROTATE] = {"LOG FILENAME", glusterd_handle_log_rotate, + NULL, GLUSTER_CLI_LOG_ROTATE, DRC_NA, 0}, + [GLUSTER_CLI_SET_VOLUME] = {"SET_VOLUME", glusterd_handle_set_volume, NULL, + GLUSTER_CLI_SET_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_SYNC_VOLUME] = {"SYNC_VOLUME", glusterd_handle_sync_volume, + NULL, GLUSTER_CLI_SYNC_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_RESET_VOLUME] = {"RESET_VOLUME", glusterd_handle_reset_volume, + NULL, GLUSTER_CLI_RESET_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_FSM_LOG] = {"FSM_LOG", glusterd_handle_fsm_log, NULL, + GLUSTER_CLI_FSM_LOG, DRC_NA, 0}, + [GLUSTER_CLI_GSYNC_SET] = {"GSYNC_SET", glusterd_handle_gsync_set, NULL, + GLUSTER_CLI_GSYNC_SET, DRC_NA, 0}, + [GLUSTER_CLI_PROFILE_VOLUME] = {"STATS_VOLUME", + glusterd_handle_cli_profile_volume, NULL, + GLUSTER_CLI_PROFILE_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_QUOTA] = {"QUOTA", glusterd_handle_quota, NULL, + GLUSTER_CLI_QUOTA, DRC_NA, 0}, + [GLUSTER_CLI_GETWD] = {"GETWD", glusterd_handle_getwd, NULL, + GLUSTER_CLI_GETWD, DRC_NA, 1}, + [GLUSTER_CLI_STATUS_VOLUME] = {"STATUS_VOLUME", + glusterd_handle_status_volume, NULL, + GLUSTER_CLI_STATUS_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_MOUNT] = {"MOUNT", glusterd_handle_mount, NULL, + GLUSTER_CLI_MOUNT, DRC_NA, 1}, + [GLUSTER_CLI_UMOUNT] = {"UMOUNT", glusterd_handle_umount, NULL, + GLUSTER_CLI_UMOUNT, DRC_NA, 1}, + [GLUSTER_CLI_HEAL_VOLUME] = {"HEAL_VOLUME", glusterd_handle_cli_heal_volume, + NULL, GLUSTER_CLI_HEAL_VOLUME, DRC_NA, 0}, [GLUSTER_CLI_STATEDUMP_VOLUME] = {"STATEDUMP_VOLUME", - GLUSTER_CLI_STATEDUMP_VOLUME, glusterd_handle_cli_statedump_volume, - NULL, 0, DRC_NA}, - [GLUSTER_CLI_LIST_VOLUME] = {"LIST_VOLUME", GLUSTER_CLI_LIST_VOLUME, - glusterd_handle_cli_list_volume, NULL, 0, - DRC_NA}, + NULL, GLUSTER_CLI_STATEDUMP_VOLUME, + DRC_NA, 0}, + [GLUSTER_CLI_LIST_VOLUME] = {"LIST_VOLUME", glusterd_handle_cli_list_volume, + NULL, GLUSTER_CLI_LIST_VOLUME, DRC_NA, 0}, [GLUSTER_CLI_CLRLOCKS_VOLUME] = {"CLEARLOCKS_VOLUME", - GLUSTER_CLI_CLRLOCKS_VOLUME, glusterd_handle_cli_clearlocks_volume, - NULL, 0, DRC_NA}, - [GLUSTER_CLI_COPY_FILE] = {"COPY_FILE", GLUSTER_CLI_COPY_FILE, - glusterd_handle_copy_file, NULL, 0, DRC_NA}, - [GLUSTER_CLI_SYS_EXEC] = {"SYS_EXEC", GLUSTER_CLI_SYS_EXEC, - glusterd_handle_sys_exec, NULL, 0, DRC_NA}, - [GLUSTER_CLI_SNAP] = {"SNAP", GLUSTER_CLI_SNAP, glusterd_handle_snapshot, - NULL, 0, DRC_NA}, - [GLUSTER_CLI_BARRIER_VOLUME] = {"BARRIER_VOLUME", - GLUSTER_CLI_BARRIER_VOLUME, - glusterd_handle_barrier, NULL, 0, DRC_NA}, - [GLUSTER_CLI_GANESHA] = {"GANESHA", GLUSTER_CLI_GANESHA, - glusterd_handle_ganesha_cmd, NULL, 0, DRC_NA}, - [GLUSTER_CLI_GET_VOL_OPT] = {"GET_VOL_OPT", GLUSTER_CLI_GET_VOL_OPT, - glusterd_handle_get_vol_opt, NULL, 0, DRC_NA}, - [GLUSTER_CLI_BITROT] = {"BITROT", GLUSTER_CLI_BITROT, - glusterd_handle_bitrot, NULL, 0, DRC_NA}, - [GLUSTER_CLI_GET_STATE] = {"GET_STATE", GLUSTER_CLI_GET_STATE, - glusterd_handle_get_state, NULL, 0, DRC_NA}, - [GLUSTER_CLI_RESET_BRICK] = {"RESET_BRICK", GLUSTER_CLI_RESET_BRICK, - glusterd_handle_reset_brick, NULL, 0, DRC_NA}, - [GLUSTER_CLI_TIER] = {"TIER", GLUSTER_CLI_TIER, glusterd_handle_tier, NULL, - 0, DRC_NA}, + NULL, GLUSTER_CLI_CLRLOCKS_VOLUME, DRC_NA, + 0}, + [GLUSTER_CLI_COPY_FILE] = {"COPY_FILE", glusterd_handle_copy_file, NULL, + GLUSTER_CLI_COPY_FILE, DRC_NA, 0}, + [GLUSTER_CLI_SYS_EXEC] = {"SYS_EXEC", glusterd_handle_sys_exec, NULL, + GLUSTER_CLI_SYS_EXEC, DRC_NA, 0}, + [GLUSTER_CLI_SNAP] = {"SNAP", glusterd_handle_snapshot, NULL, + GLUSTER_CLI_SNAP, DRC_NA, 0}, + [GLUSTER_CLI_BARRIER_VOLUME] = {"BARRIER_VOLUME", glusterd_handle_barrier, + NULL, GLUSTER_CLI_BARRIER_VOLUME, DRC_NA, + 0}, + [GLUSTER_CLI_GANESHA] = {"GANESHA", glusterd_handle_ganesha_cmd, NULL, + GLUSTER_CLI_GANESHA, DRC_NA, 0}, + [GLUSTER_CLI_GET_VOL_OPT] = {"GET_VOL_OPT", glusterd_handle_get_vol_opt, + NULL, DRC_NA, 0}, + [GLUSTER_CLI_BITROT] = {"BITROT", glusterd_handle_bitrot, NULL, + GLUSTER_CLI_BITROT, DRC_NA, 0}, + [GLUSTER_CLI_GET_STATE] = {"GET_STATE", glusterd_handle_get_state, NULL, + GLUSTER_CLI_GET_STATE, DRC_NA, 0}, + [GLUSTER_CLI_RESET_BRICK] = {"RESET_BRICK", glusterd_handle_reset_brick, + NULL, GLUSTER_CLI_RESET_BRICK, DRC_NA, 0}, + [GLUSTER_CLI_TIER] = {"TIER", glusterd_handle_tier, NULL, GLUSTER_CLI_TIER, + DRC_NA, 0}, [GLUSTER_CLI_REMOVE_TIER_BRICK] = {"REMOVE_TIER_BRICK", - GLUSTER_CLI_REMOVE_TIER_BRICK, - glusterd_handle_tier, NULL, 0, DRC_NA}, + glusterd_handle_tier, NULL, + GLUSTER_CLI_REMOVE_TIER_BRICK, DRC_NA, + 0}, [GLUSTER_CLI_ADD_TIER_BRICK] = {"ADD_TIER_BRICK", - GLUSTER_CLI_ADD_TIER_BRICK, - glusterd_handle_add_tier_brick, NULL, 0, - DRC_NA}, + glusterd_handle_add_tier_brick, NULL, + GLUSTER_CLI_ADD_TIER_BRICK, DRC_NA, 0}, }; struct rpcsvc_program gd_svc_cli_prog = { @@ -6536,27 +6532,25 @@ struct rpcsvc_program gd_svc_cli_prog = { * read only queries, the only exception being MOUNT/UMOUNT which is required * by geo-replication to support unprivileged master -> slave sessions. */ -rpcsvc_actor_t gd_svc_cli_trusted_actors[GLUSTER_CLI_MAXVALUE] = { - [GLUSTER_CLI_LIST_FRIENDS] = {"LIST_FRIENDS", GLUSTER_CLI_LIST_FRIENDS, - glusterd_handle_cli_list_friends, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_UUID_GET] = {"UUID_GET", GLUSTER_CLI_UUID_GET, - glusterd_handle_cli_uuid_get, NULL, 0, DRC_NA}, - [GLUSTER_CLI_GET_VOLUME] = {"GET_VOLUME", GLUSTER_CLI_GET_VOLUME, - glusterd_handle_cli_get_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_GETWD] = {"GETWD", GLUSTER_CLI_GETWD, glusterd_handle_getwd, - NULL, 1, DRC_NA}, - [GLUSTER_CLI_STATUS_VOLUME] = {"STATUS_VOLUME", GLUSTER_CLI_STATUS_VOLUME, - glusterd_handle_status_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_LIST_VOLUME] = {"LIST_VOLUME", GLUSTER_CLI_LIST_VOLUME, - glusterd_handle_cli_list_volume, NULL, 0, - DRC_NA}, - [GLUSTER_CLI_MOUNT] = {"MOUNT", GLUSTER_CLI_MOUNT, glusterd_handle_mount, - NULL, 1, DRC_NA}, - [GLUSTER_CLI_UMOUNT] = {"UMOUNT", GLUSTER_CLI_UMOUNT, - glusterd_handle_umount, NULL, 1, DRC_NA}, +static rpcsvc_actor_t gd_svc_cli_trusted_actors[GLUSTER_CLI_MAXVALUE] = { + [GLUSTER_CLI_LIST_FRIENDS] = {"LIST_FRIENDS", + glusterd_handle_cli_list_friends, NULL, + GLUSTER_CLI_LIST_FRIENDS, DRC_NA, 0}, + [GLUSTER_CLI_UUID_GET] = {"UUID_GET", glusterd_handle_cli_uuid_get, NULL, + GLUSTER_CLI_UUID_GET, DRC_NA, 0}, + [GLUSTER_CLI_GET_VOLUME] = {"GET_VOLUME", glusterd_handle_cli_get_volume, + NULL, GLUSTER_CLI_GET_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_GETWD] = {"GETWD", glusterd_handle_getwd, NULL, + GLUSTER_CLI_GETWD, DRC_NA, 1}, + [GLUSTER_CLI_STATUS_VOLUME] = {"STATUS_VOLUME", + glusterd_handle_status_volume, NULL, + GLUSTER_CLI_STATUS_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_LIST_VOLUME] = {"LIST_VOLUME", glusterd_handle_cli_list_volume, + NULL, GLUSTER_CLI_LIST_VOLUME, DRC_NA, 0}, + [GLUSTER_CLI_MOUNT] = {"MOUNT", glusterd_handle_mount, NULL, + GLUSTER_CLI_MOUNT, DRC_NA, 1}, + [GLUSTER_CLI_UMOUNT] = {"UMOUNT", glusterd_handle_umount, NULL, + GLUSTER_CLI_UMOUNT, DRC_NA, 1}, }; struct rpcsvc_program gd_svc_cli_trusted_progs = { diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index a6cdbcef82c..1671c2481dc 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -1708,16 +1708,16 @@ server_get_snap_info(rpcsvc_request_t *req) return glusterd_big_locked_handler(req, __server_get_snap_info); } -rpcsvc_actor_t gluster_handshake_actors[GF_HNDSK_MAXVALUE] = { - [GF_HNDSK_NULL] = {"NULL", GF_HNDSK_NULL, NULL, NULL, 0, DRC_NA}, - [GF_HNDSK_GETSPEC] = {"GETSPEC", GF_HNDSK_GETSPEC, server_getspec, NULL, 0, - DRC_NA}, - [GF_HNDSK_EVENT_NOTIFY] = {"EVENTNOTIFY", GF_HNDSK_EVENT_NOTIFY, - server_event_notify, NULL, 0, DRC_NA}, - [GF_HNDSK_GET_VOLUME_INFO] = {"GETVOLUMEINFO", GF_HNDSK_GET_VOLUME_INFO, - server_get_volume_info, NULL, 0, DRC_NA}, - [GF_HNDSK_GET_SNAPSHOT_INFO] = {"GETSNAPINFO", GF_HNDSK_GET_SNAPSHOT_INFO, - server_get_snap_info, NULL, 0, DRC_NA}, +static rpcsvc_actor_t gluster_handshake_actors[GF_HNDSK_MAXVALUE] = { + [GF_HNDSK_NULL] = {"NULL", NULL, NULL, GF_HNDSK_NULL, DRC_NA, 0}, + [GF_HNDSK_GETSPEC] = {"GETSPEC", server_getspec, NULL, GF_HNDSK_GETSPEC, + DRC_NA, 0}, + [GF_HNDSK_EVENT_NOTIFY] = {"EVENTNOTIFY", server_event_notify, NULL, + GF_HNDSK_EVENT_NOTIFY, DRC_NA, 0}, + [GF_HNDSK_GET_VOLUME_INFO] = {"GETVOLUMEINFO", server_get_volume_info, NULL, + GF_HNDSK_GET_VOLUME_INFO, DRC_NA, 0}, + [GF_HNDSK_GET_SNAPSHOT_INFO] = {"GETSNAPINFO", server_get_snap_info, NULL, + GF_HNDSK_GET_SNAPSHOT_INFO, DRC_NA, 0}, }; struct rpcsvc_program gluster_handshake_prog = { @@ -1729,9 +1729,9 @@ struct rpcsvc_program gluster_handshake_prog = { }; /* A minimal RPC program just for the cli getspec command */ -rpcsvc_actor_t gluster_cli_getspec_actors[GF_HNDSK_MAXVALUE] = { - [GF_HNDSK_GETSPEC] = {"GETSPEC", GF_HNDSK_GETSPEC, server_getspec, NULL, 0, - DRC_NA}, +static rpcsvc_actor_t gluster_cli_getspec_actors[GF_HNDSK_MAXVALUE] = { + [GF_HNDSK_GETSPEC] = {"GETSPEC", server_getspec, NULL, GF_HNDSK_GETSPEC, + DRC_NA, 0}, }; struct rpcsvc_program gluster_cli_getspec_prog = { @@ -1742,26 +1742,26 @@ struct rpcsvc_program gluster_cli_getspec_prog = { .numactors = GF_HNDSK_MAXVALUE, }; -char *glusterd_dump_proc[GF_DUMP_MAXVALUE] = { +static char *glusterd_dump_proc[GF_DUMP_MAXVALUE] = { [GF_DUMP_NULL] = "NULL", [GF_DUMP_DUMP] = "DUMP", [GF_DUMP_PING] = "PING", }; -rpc_clnt_prog_t glusterd_dump_prog = { +static rpc_clnt_prog_t glusterd_dump_prog = { .progname = "GLUSTERD-DUMP", .prognum = GLUSTER_DUMP_PROGRAM, .progver = GLUSTER_DUMP_VERSION, .procnames = glusterd_dump_proc, }; -rpcsvc_actor_t glusterd_mgmt_hndsk_actors[GD_MGMT_HNDSK_MAXVALUE] = { - [GD_MGMT_HNDSK_NULL] = {"NULL", GD_MGMT_HNDSK_NULL, NULL, NULL, 0, DRC_NA}, - [GD_MGMT_HNDSK_VERSIONS] = {"MGMT-VERS", GD_MGMT_HNDSK_VERSIONS, - glusterd_mgmt_hndsk_versions, NULL, 0, DRC_NA}, - [GD_MGMT_HNDSK_VERSIONS_ACK] = {"MGMT-VERS-ACK", GD_MGMT_HNDSK_VERSIONS_ACK, - glusterd_mgmt_hndsk_versions_ack, NULL, 0, - DRC_NA}, +static rpcsvc_actor_t glusterd_mgmt_hndsk_actors[GD_MGMT_HNDSK_MAXVALUE] = { + [GD_MGMT_HNDSK_NULL] = {"NULL", NULL, NULL, GD_MGMT_HNDSK_NULL, DRC_NA, 0}, + [GD_MGMT_HNDSK_VERSIONS] = {"MGMT-VERS", glusterd_mgmt_hndsk_versions, NULL, + GD_MGMT_HNDSK_VERSIONS, DRC_NA, 0}, + [GD_MGMT_HNDSK_VERSIONS_ACK] = {"MGMT-VERS-ACK", + glusterd_mgmt_hndsk_versions_ack, NULL, + GD_MGMT_HNDSK_VERSIONS_ACK, DRC_NA, 0}, }; struct rpcsvc_program glusterd_mgmt_hndsk_prog = { @@ -1772,13 +1772,13 @@ struct rpcsvc_program glusterd_mgmt_hndsk_prog = { .numactors = GD_MGMT_HNDSK_MAXVALUE, }; -char *glusterd_mgmt_hndsk_proc[GD_MGMT_HNDSK_MAXVALUE] = { +static char *glusterd_mgmt_hndsk_proc[GD_MGMT_HNDSK_MAXVALUE] = { [GD_MGMT_HNDSK_NULL] = "NULL", [GD_MGMT_HNDSK_VERSIONS] = "MGMT-VERS", [GD_MGMT_HNDSK_VERSIONS_ACK] = "MGMT-VERS-ACK", }; -rpc_clnt_prog_t gd_clnt_mgmt_hndsk_prog = { +static rpc_clnt_prog_t gd_clnt_mgmt_hndsk_prog = { .progname = "Gluster MGMT Handshake", .prognum = GD_MGMT_HNDSK_PROGRAM, .progver = GD_MGMT_HNDSK_VERSION, diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c b/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c index c8b080cc0ca..ef8b4c38571 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c @@ -966,25 +966,25 @@ glusterd_handle_mgmt_v3_unlock(rpcsvc_request_t *req) return glusterd_big_locked_handler(req, glusterd_handle_mgmt_v3_unlock_fn); } -rpcsvc_actor_t gd_svc_mgmt_v3_actors[GLUSTERD_MGMT_V3_MAXVALUE] = { - [GLUSTERD_MGMT_V3_NULL] = {"NULL", GLUSTERD_MGMT_V3_NULL, - glusterd_mgmt_v3_null, NULL, 0, DRC_NA}, - [GLUSTERD_MGMT_V3_LOCK] = {"MGMT_V3_LOCK", GLUSTERD_MGMT_V3_LOCK, - glusterd_handle_mgmt_v3_lock, NULL, 0, DRC_NA}, - [GLUSTERD_MGMT_V3_PRE_VALIDATE] = {"PRE_VAL", GLUSTERD_MGMT_V3_PRE_VALIDATE, - glusterd_handle_pre_validate, NULL, 0, - DRC_NA}, - [GLUSTERD_MGMT_V3_BRICK_OP] = {"BRCK_OP", GLUSTERD_MGMT_V3_BRICK_OP, - glusterd_handle_brick_op, NULL, 0, DRC_NA}, - [GLUSTERD_MGMT_V3_COMMIT] = {"COMMIT", GLUSTERD_MGMT_V3_COMMIT, - glusterd_handle_commit, NULL, 0, DRC_NA}, +static rpcsvc_actor_t gd_svc_mgmt_v3_actors[GLUSTERD_MGMT_V3_MAXVALUE] = { + [GLUSTERD_MGMT_V3_NULL] = {"NULL", glusterd_mgmt_v3_null, NULL, + GLUSTERD_MGMT_V3_NULL, DRC_NA, 0}, + [GLUSTERD_MGMT_V3_LOCK] = {"MGMT_V3_LOCK", glusterd_handle_mgmt_v3_lock, + NULL, GLUSTERD_MGMT_V3_LOCK, DRC_NA, 0}, + [GLUSTERD_MGMT_V3_PRE_VALIDATE] = {"PRE_VAL", glusterd_handle_pre_validate, + NULL, GLUSTERD_MGMT_V3_PRE_VALIDATE, + DRC_NA, 0}, + [GLUSTERD_MGMT_V3_BRICK_OP] = {"BRCK_OP", glusterd_handle_brick_op, NULL, + GLUSTERD_MGMT_V3_BRICK_OP, DRC_NA, 0}, + [GLUSTERD_MGMT_V3_COMMIT] = {"COMMIT", glusterd_handle_commit, NULL, + GLUSTERD_MGMT_V3_COMMIT, DRC_NA, 0}, [GLUSTERD_MGMT_V3_POST_VALIDATE] = {"POST_VAL", - GLUSTERD_MGMT_V3_POST_VALIDATE, - glusterd_handle_post_validate, NULL, 0, - DRC_NA}, - [GLUSTERD_MGMT_V3_UNLOCK] = {"MGMT_V3_UNLOCK", GLUSTERD_MGMT_V3_UNLOCK, - glusterd_handle_mgmt_v3_unlock, NULL, 0, - DRC_NA}, + glusterd_handle_post_validate, NULL, + GLUSTERD_MGMT_V3_POST_VALIDATE, DRC_NA, + 0}, + [GLUSTERD_MGMT_V3_UNLOCK] = {"MGMT_V3_UNLOCK", + glusterd_handle_mgmt_v3_unlock, NULL, + GLUSTERD_MGMT_V3_UNLOCK, DRC_NA, 0}, }; struct rpcsvc_program gd_svc_mgmt_v3_prog = { diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.c b/xlators/mgmt/glusterd/src/glusterd-pmap.c index e54596e0001..ec5bd1137f1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-pmap.c +++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c @@ -635,16 +635,16 @@ gluster_pmap_signout(rpcsvc_request_t *req) return glusterd_big_locked_handler(req, __gluster_pmap_signout); } -rpcsvc_actor_t gluster_pmap_actors[GF_PMAP_MAXVALUE] = { - [GF_PMAP_NULL] = {"NULL", GF_PMAP_NULL, NULL, NULL, 0, DRC_NA}, - [GF_PMAP_PORTBYBRICK] = {"PORTBYBRICK", GF_PMAP_PORTBYBRICK, - gluster_pmap_portbybrick, NULL, 0, DRC_NA}, - [GF_PMAP_BRICKBYPORT] = {"BRICKBYPORT", GF_PMAP_BRICKBYPORT, - gluster_pmap_brickbyport, NULL, 0, DRC_NA}, - [GF_PMAP_SIGNIN] = {"SIGNIN", GF_PMAP_SIGNIN, gluster_pmap_signin, NULL, 0, - DRC_NA}, - [GF_PMAP_SIGNOUT] = {"SIGNOUT", GF_PMAP_SIGNOUT, gluster_pmap_signout, NULL, - 0, DRC_NA}, +static rpcsvc_actor_t gluster_pmap_actors[GF_PMAP_MAXVALUE] = { + [GF_PMAP_NULL] = {"NULL", NULL, NULL, GF_PMAP_NULL, DRC_NA, 0}, + [GF_PMAP_PORTBYBRICK] = {"PORTBYBRICK", gluster_pmap_portbybrick, NULL, + GF_PMAP_PORTBYBRICK, DRC_NA, 0}, + [GF_PMAP_BRICKBYPORT] = {"BRICKBYPORT", gluster_pmap_brickbyport, NULL, + GF_PMAP_BRICKBYPORT, DRC_NA, 0}, + [GF_PMAP_SIGNIN] = {"SIGNIN", gluster_pmap_signin, NULL, GF_PMAP_SIGNIN, + DRC_NA, 0}, + [GF_PMAP_SIGNOUT] = {"SIGNOUT", gluster_pmap_signout, NULL, GF_PMAP_SIGNOUT, + DRC_NA, 0}, }; struct rpcsvc_program gluster_pmap_prog = { |