Merge pull request #8381 from dgquintas/lb-cost-bin

Renamed MD key "lb-cost" to "lb-cost-bin"
pull/8450/head
David G. Quintas 8 years ago committed by GitHub
commit 79fd4e6874
  1. 2
      src/core/ext/load_reporting/load_reporting.h
  2. 2
      src/core/ext/load_reporting/load_reporting_filter.c
  3. 2
      src/core/lib/transport/static_metadata.c
  4. 8
      src/core/lib/transport/static_metadata.h
  5. 4
      test/core/end2end/fuzzers/hpack.dictionary
  6. 2
      tools/codegen/core/gen_static_metadata.py

@ -51,7 +51,7 @@
* The value corresponding to this key is an opaque binary blob reported by the * The value corresponding to this key is an opaque binary blob reported by the
* backend as part of its trailing metadata containing cost information for the * backend as part of its trailing metadata containing cost information for the
* call. */ * call. */
#define GRPC_LB_COST_MD_KEY "lb-cost" #define GRPC_LB_COST_MD_KEY "lb-cost-bin"
/** Identifiers for the invocation point of the users LR callback */ /** Identifiers for the invocation point of the users LR callback */
typedef enum grpc_load_reporting_source { typedef enum grpc_load_reporting_source {

@ -193,7 +193,7 @@ static grpc_mdelem *lr_trailing_md_filter(void *user_data, grpc_mdelem *md) {
grpc_call_element *elem = user_data; grpc_call_element *elem = user_data;
call_data *calld = elem->call_data; call_data *calld = elem->call_data;
if (md->key == GRPC_MDSTR_LB_COST) { if (md->key == GRPC_MDSTR_LB_COST_BIN) {
calld->trailing_md_string = gpr_strdup(grpc_mdstr_as_c_string(md->value)); calld->trailing_md_string = gpr_strdup(grpc_mdstr_as_c_string(md->value));
return NULL; return NULL;
} }

@ -126,7 +126,7 @@ const char *const grpc_static_metadata_strings[GRPC_STATIC_MDSTR_COUNT] = {
"if-range", "if-range",
"if-unmodified-since", "if-unmodified-since",
"last-modified", "last-modified",
"lb-cost", "lb-cost-bin",
"lb-token", "lb-token",
"link", "link",
"location", "location",

@ -175,8 +175,8 @@ extern grpc_mdstr grpc_static_mdstr_table[GRPC_STATIC_MDSTR_COUNT];
#define GRPC_MDSTR_IF_UNMODIFIED_SINCE (&grpc_static_mdstr_table[62]) #define GRPC_MDSTR_IF_UNMODIFIED_SINCE (&grpc_static_mdstr_table[62])
/* "last-modified" */ /* "last-modified" */
#define GRPC_MDSTR_LAST_MODIFIED (&grpc_static_mdstr_table[63]) #define GRPC_MDSTR_LAST_MODIFIED (&grpc_static_mdstr_table[63])
/* "lb-cost" */ /* "lb-cost-bin" */
#define GRPC_MDSTR_LB_COST (&grpc_static_mdstr_table[64]) #define GRPC_MDSTR_LB_COST_BIN (&grpc_static_mdstr_table[64])
/* "lb-token" */ /* "lb-token" */
#define GRPC_MDSTR_LB_TOKEN (&grpc_static_mdstr_table[65]) #define GRPC_MDSTR_LB_TOKEN (&grpc_static_mdstr_table[65])
/* "link" */ /* "link" */
@ -337,8 +337,8 @@ extern uintptr_t grpc_static_mdelem_user_data[GRPC_STATIC_MDELEM_COUNT];
#define GRPC_MDELEM_IF_UNMODIFIED_SINCE_EMPTY (&grpc_static_mdelem_table[44]) #define GRPC_MDELEM_IF_UNMODIFIED_SINCE_EMPTY (&grpc_static_mdelem_table[44])
/* "last-modified": "" */ /* "last-modified": "" */
#define GRPC_MDELEM_LAST_MODIFIED_EMPTY (&grpc_static_mdelem_table[45]) #define GRPC_MDELEM_LAST_MODIFIED_EMPTY (&grpc_static_mdelem_table[45])
/* "lb-cost": "" */ /* "lb-cost-bin": "" */
#define GRPC_MDELEM_LB_COST_EMPTY (&grpc_static_mdelem_table[46]) #define GRPC_MDELEM_LB_COST_BIN_EMPTY (&grpc_static_mdelem_table[46])
/* "lb-token": "" */ /* "lb-token": "" */
#define GRPC_MDELEM_LB_TOKEN_EMPTY (&grpc_static_mdelem_table[47]) #define GRPC_MDELEM_LB_TOKEN_EMPTY (&grpc_static_mdelem_table[47])
/* "link": "" */ /* "link": "" */

@ -63,7 +63,7 @@
"\x08if-range" "\x08if-range"
"\x13if-unmodified-since" "\x13if-unmodified-since"
"\x0Dlast-modified" "\x0Dlast-modified"
"\x07lb-cost" "\x0Blb-cost-bin"
"\x08lb-token" "\x08lb-token"
"\x04link" "\x04link"
"\x08location" "\x08location"
@ -138,7 +138,7 @@
"\x00\x08if-range\x00" "\x00\x08if-range\x00"
"\x00\x13if-unmodified-since\x00" "\x00\x13if-unmodified-since\x00"
"\x00\x0Dlast-modified\x00" "\x00\x0Dlast-modified\x00"
"\x00\x07lb-cost\x00" "\x00\x0Blb-cost-bin\x00"
"\x00\x08lb-token\x00" "\x00\x08lb-token\x00"
"\x00\x04link\x00" "\x00\x04link\x00"
"\x00\x08location\x00" "\x00\x08location\x00"

@ -110,7 +110,7 @@ CONFIG = [
('if-unmodified-since', ''), ('if-unmodified-since', ''),
('last-modified', ''), ('last-modified', ''),
('lb-token', ''), ('lb-token', ''),
('lb-cost', ''), ('lb-cost-bin', ''),
('link', ''), ('link', ''),
('location', ''), ('location', ''),
('max-forwards', ''), ('max-forwards', ''),

Loading…
Cancel
Save