Hello,
On Fri, 14 Jun 2013, Alexander Frolkin wrote:
> Hi,
>
> > --sched-flags sh-fallback,sh-port
>
> Updated ipvsadm patch below. I've kept -b for now: there are no long
> options in ipvsadm -S output, and I think it would be nice to keep it
> that way.
OK, if others do not come up with another idea.
> diff --git a/ipvsadm.c b/ipvsadm.c
> index 0197515..9679cf7 100644
> --- a/ipvsadm.c
> +++ b/ipvsadm.c
> @@ -182,7 +182,8 @@ static const char* cmdnames[] = {
> #define OPT_EXACT 0x100000
> #define OPT_ONEPACKET 0x200000
> #define OPT_PERSISTENCE_ENGINE 0x400000
> -#define NUMBER_OF_OPT 23
> +#define OPT_SCHED_FLAGS 0x800000
> +#define NUMBER_OF_OPT 24
>
> static const char* optnames[] = {
> "numeric",
> @@ -207,7 +208,7 @@ static const char* optnames[] = {
> "syncid",
> "exact",
> "ops",
> - "pe",
> + "pe"
sched-flags here?
> };
>
> /*
> @@ -220,21 +221,21 @@ static const char* optnames[] = {
> */
> static const char commands_v_options[NUMBER_OF_CMD][NUMBER_OF_OPT] =
> {
> - /* -n -c svc -s -p -M -r fwd -w -x -y -mc tot dmn -st -rt thr -pc srt sid -ex ops -pe */
> -/*ADD*/ {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', ' '},
> -/*EDIT*/ {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', ' '},
> -/*DEL*/ {'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> -/*FLUSH*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> -/*LIST*/ {' ', '1', '1', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', '1', '1', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'x', 'x'},
> -/*ADDSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> -/*DELSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> -/*EDITSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> -/*TIMEOUT*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> -/*STARTD*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x'},
> -/*STOPD*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x'},
> -/*RESTORE*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> -/*SAVE*/ {' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> -/*ZERO*/ {'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> + /* -n -c svc -s -p -M -r fwd -w -x -y -mc tot dmn -st -rt thr -pc srt sid -ex ops -pe -b */
> +/*ADD*/ {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', ' ', ' '},
> +/*EDIT*/ {'x', 'x', '+', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', ' ', ' '},
> +/*DEL*/ {'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> +/*FLUSH*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> +/*LIST*/ {' ', '1', '1', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', '1', '1', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'x', 'x', 'x'},
> +/*ADDSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> +/*DELSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> +/*EDITSRV*/ {'x', 'x', '+', 'x', 'x', 'x', '+', ' ', ' ', ' ', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> +/*TIMEOUT*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> +/*STARTD*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x', 'x'},
> +/*STOPD*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', ' ', 'x', 'x', 'x', 'x'},
> +/*RESTORE*/ {'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> +/*SAVE*/ {' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> +/*ZERO*/ {'x', 'x', ' ', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x'},
> };
>
> /* printing format flags */
> @@ -285,6 +286,7 @@ enum {
> TAG_SORT,
> TAG_NO_SORT,
> TAG_PERSISTENCE_ENGINE,
> + TAG_SCHED_FLAGS
TAG_SCHED_FLAGS is not needed with 'b'
> };
>
> /* various parsing helpers & parsing functions */
> @@ -363,7 +365,7 @@ parse_options(int argc, char **argv, struct ipvs_command_entry *ce,
> {
> int c, parse;
> poptContext context;
> - char *optarg=NULL;
> + char *optarg=NULL, *flag;
> struct poptOption options_table[] = {
> { "add-service", 'A', POPT_ARG_NONE, NULL, 'A', NULL, NULL },
> { "edit-service", 'E', POPT_ARG_NONE, NULL, 'E', NULL, NULL },
> @@ -426,6 +428,7 @@ parse_options(int argc, char **argv, struct ipvs_command_entry *ce,
> { "ops", 'o', POPT_ARG_NONE, NULL, 'o', NULL, NULL },
> { "pe", '\0', POPT_ARG_STRING, &optarg, TAG_PERSISTENCE_ENGINE,
> NULL, NULL },
> + { "sched-flags", 'b', POPT_ARG_STRING, &optarg, 'b', NULL, NULL },
> { NULL, 0, 0, NULL, 0, NULL, NULL }
> };
>
> @@ -656,6 +659,25 @@ parse_options(int argc, char **argv, struct ipvs_command_entry *ce,
> set_option(options, OPT_PERSISTENCE_ENGINE);
> strncpy(ce->svc.pe_name, optarg, IP_VS_PENAME_MAXLEN);
> break;
> + case 'b':
> + set_option(options, OPT_SCHED_FLAGS);
> + ce->svc.flags &= ~(IP_VS_SVC_F_SCHED1 | IP_VS_SVC_F_SCHED2 | IP_VS_SVC_F_SCHED3);
> + flag = strtok(optarg, ",");
Moving the following parsing in separate
function parse_sched_flags(sched, optarg) will look better:
ce->svc.flags |= parse_sched_flags(ce->svc.sched_name, optarg);
By this way we can restrict sh-fallback and sh-port
to the "sh" scheduler. It seems ce->svc.sched_name is
empty initially (DEF_SCHED).
For example:
> + do {
char *need = NULL;
> + if (!strcmp(flag, "flag-1"))
> + ce->svc.flags |= IP_VS_SVC_F_SCHED1;
> + else if (!strcmp(flag, "flag-2"))
> + ce->svc.flags |= IP_VS_SVC_F_SCHED2;
> + else if (!strcmp(flag, "flag-3"))
> + ce->svc.flags |= IP_VS_SVC_F_SCHED3;
> + else if (!strcmp(flag, "sh-fallback"))
> + ce->svc.flags |= IP_VS_SVC_F_SCHED_SH_FALLBACK;
need = "sh";
> + else if (!strcmp(flag, "sh-port"))
> + ce->svc.flags |= IP_VS_SVC_F_SCHED_SH_PORT;
need = "sh";
> + else
> + fail(2, "invalid scheduler flag `%s'", flag);
if (need && strcmp((sched && *sched) ? sched : DEF_SCHED, need))
fail(2, "Incompatible scheduler flag `%s', flag);
> + } while ((flag = strtok(NULL, ",")) != NULL);
> + break;
> default:
> fail(2, "invalid option `%s'",
> poptBadOption(context, POPT_BADOPTION_NOALIAS));
> @@ -1070,7 +1092,7 @@ static void usage_exit(const char *program, const int exit_status)
> version(stream);
> fprintf(stream,
> "Usage:\n"
> - " %s -A|E -t|u|f service-address [-s scheduler] [-p [timeout]] [-M netmask] [--pe persistence_engine]\n"
> + " %s -A|E -t|u|f service-address [-s scheduler] [-p [timeout]] [-M netmask] [--pe persistence_engine] [-b sched-flags]\n"
> " %s -D -t|u|f service-address\n"
> " %s -C\n"
> " %s -R\n"
> @@ -1139,7 +1161,8 @@ static void usage_exit(const char *program, const int exit_status)
> " --nosort disable sorting output of service/server entries\n"
> " --sort does nothing, for backwards compatibility\n"
> " --ops -o one-packet scheduling\n"
> - " --numeric -n numeric output of addresses and ports\n",
> + " --numeric -n numeric output of addresses and ports\n"
> + " --sched-flags -b flags scheduler flags (comma-separated)\n",
> DEF_SCHED);
>
> exit(exit_status);
> @@ -1396,6 +1419,27 @@ static void print_largenum(unsigned long long i, unsigned int format)
> printf("%8lluT", i / 1000000000000ULL);
> }
>
> +static void print_sched_flags(ipvs_service_entry_t *se) {
> + char flags[64] = "";
> +
char flags[64];
flags[0] = 0;
> + if (!strcmp(se->sched_name, "sh")) {
> + if (se->flags & IP_VS_SVC_F_SCHED_SH_FALLBACK)
> + strcat(flags, "sh-fallback,");
> + if (se->flags & IP_VS_SVC_F_SCHED_SH_PORT)
> + strcat(flags, "sh-port,");
> + } else {
> + if (se->flags & IP_VS_SVC_F_SCHED1)
> + strcat(flags, "flag-1,");
> + if (se->flags & IP_VS_SVC_F_SCHED2)
> + strcat(flags, "flag-2,");
> + if (se->flags & IP_VS_SVC_F_SCHED3)
> + strcat(flags, "flag-3,");
> + }
> +
This should be safer:
if (flags[0]) {
> + flags[strlen(flags)-1] = '\0';
> +
> + printf("%s", flags);
}
but now print_sched_flags() is guarded,
so it is not a big deal.
> +}
>
> static void print_title(unsigned int format)
> {
> @@ -1488,6 +1532,10 @@ print_service_entry(ipvs_service_entry_t *se, unsigned int format)
> printf(" pe %s", se->pe_name);
> if (se->flags & IP_VS_SVC_F_ONEPACKET)
> printf(" -o");
> + if (se->flags & (IP_VS_SVC_F_SCHED1 | IP_VS_SVC_F_SCHED2 | IP_VS_SVC_F_SCHED3)) {
> + printf(" -b ");
> + print_sched_flags(se);
> + }
> } else if (format & FMT_STATS) {
> printf("%-33s", svc_name);
> print_largenum(se->stats.conns, format);
> @@ -1504,6 +1552,11 @@ print_service_entry(ipvs_service_entry_t *se, unsigned int format)
> print_largenum(se->stats.outbps, format);
> } else {
> printf("%s %s", svc_name, se->sched_name);
> + if (se->flags & (IP_VS_SVC_F_SCHED1 | IP_VS_SVC_F_SCHED2 | IP_VS_SVC_F_SCHED3)) {
> + printf(" (");
> + print_sched_flags(se);
> + printf(")");
> + }
> if (se->flags & IP_VS_SVC_F_PERSISTENT) {
> printf(" persistent %u", se->timeout);
> if (se->af == AF_INET)
> diff --git a/libipvs/ip_vs.h b/libipvs/ip_vs.h
> index 5e1d544..4db14ff 100644
> --- a/libipvs/ip_vs.h
> +++ b/libipvs/ip_vs.h
> @@ -29,6 +29,13 @@
> #define IP_VS_SVC_F_PERSISTENT 0x0001 /* persistent port */
> #define IP_VS_SVC_F_HASHED 0x0002 /* hashed entry */
> #define IP_VS_SVC_F_ONEPACKET 0x0004 /* one-packet scheduling */
> +#define IP_VS_SVC_F_SCHED1 0x0008 /* scheduler flag 1 */
> +#define IP_VS_SVC_F_SCHED2 0x0010 /* scheduler flag 2 */
> +#define IP_VS_SVC_F_SCHED3 0x0020 /* scheduler flag 3 */
> +
> +#define IP_VS_SVC_F_SCHED_SH_FALLBACK IP_VS_SVC_F_SCHED1 /* SH fallback */
> +#define IP_VS_SVC_F_SCHED_SH_PORT IP_VS_SVC_F_SCHED2 /* SH use port */
> +
>
> /*
> * IPVS sync daemon states
>
>
> Alex
Regards
--
Julian Anastasov <ja@xxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
