Merge pull request #15840 from dgquintas/common_nanopb
Update to use the canonical version of LB proto
This commit is contained in:
David G. Quintas
GitHub
commit
3acf8e6207
8
BUILD
8
BUILD
|
|
@ -1197,6 +1197,8 @@ grpc_cc_library(
|
|||
"src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c",
|
||||
],
|
||||
hdrs = [
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h",
|
||||
|
|
@ -1205,6 +1207,8 @@ grpc_cc_library(
|
|||
"src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h",
|
||||
],
|
||||
external_deps = [
|
||||
"nanopb",
|
||||
|
|
@ -1226,6 +1230,8 @@ grpc_cc_library(
|
|||
"src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c",
|
||||
],
|
||||
hdrs = [
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h",
|
||||
|
|
@ -1234,6 +1240,8 @@ grpc_cc_library(
|
|||
"src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h",
|
||||
],
|
||||
external_deps = [
|
||||
"nanopb",
|
||||
|
|
|
|||
|
|
@ -1214,6 +1214,8 @@ add_library(grpc
|
|||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
|
||||
src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
|
||||
src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
|
||||
|
|
@ -2521,6 +2523,8 @@ add_library(grpc_unsecure
|
|||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
|
||||
third_party/nanopb/pb_common.c
|
||||
third_party/nanopb/pb_decode.c
|
||||
|
|
|
|||
4
Makefile
4
Makefile
|
|
@ -3589,6 +3589,8 @@ LIBGRPC_SRC = \
|
|||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
|
||||
src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
|
||||
|
|
@ -4862,6 +4864,8 @@ LIBGRPC_UNSECURE_SRC = \
|
|||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
|
||||
third_party/nanopb/pb_common.c \
|
||||
third_party/nanopb/pb_decode.c \
|
||||
|
|
|
|||
|
|
@ -652,6 +652,8 @@ filegroups:
|
|||
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
|
||||
plugin: grpc_lb_policy_grpclb
|
||||
uses:
|
||||
|
|
@ -673,6 +675,8 @@ filegroups:
|
|||
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c
|
||||
- src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
|
||||
plugin: grpc_lb_policy_grpclb
|
||||
uses:
|
||||
|
|
|
|||
|
|
@ -367,6 +367,8 @@ if test "$PHP_GRPC" != "no"; then
|
|||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
|
||||
src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
|
||||
|
|
@ -652,6 +654,7 @@ if test "$PHP_GRPC" != "no"; then
|
|||
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel)
|
||||
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/grpclb)
|
||||
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1)
|
||||
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf)
|
||||
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/pick_first)
|
||||
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/lb_policy/round_robin)
|
||||
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/dns/c_ares)
|
||||
|
|
|
|||
|
|
@ -342,6 +342,8 @@ if (PHP_GRPC != "no") {
|
|||
"src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\grpclb_channel_secure.cc " +
|
||||
"src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\grpclb_client_stats.cc " +
|
||||
"src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\load_balancer_api.cc " +
|
||||
"src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb\\v1\\google\\protobuf\\duration.pb.c " +
|
||||
"src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb\\v1\\google\\protobuf\\timestamp.pb.c " +
|
||||
"src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb\\v1\\load_balancer.pb.c " +
|
||||
"src\\core\\ext\\filters\\client_channel\\resolver\\fake\\fake_resolver.cc " +
|
||||
"src\\core\\ext\\filters\\client_channel\\lb_policy\\pick_first\\pick_first.cc " +
|
||||
|
|
@ -661,6 +663,8 @@ if (PHP_GRPC != "no") {
|
|||
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc");
|
||||
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb");
|
||||
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb\\v1");
|
||||
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb\\v1\\google");
|
||||
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb\\v1\\google\\protobuf");
|
||||
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\pick_first");
|
||||
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\lb_policy\\round_robin");
|
||||
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver");
|
||||
|
|
|
|||
|
|
@ -779,6 +779,8 @@ Pod::Spec.new do |s|
|
|||
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
|
||||
'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
|
||||
|
|
|
|||
|
|
@ -719,6 +719,8 @@ Gem::Specification.new do |s|
|
|||
s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc )
|
||||
s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc )
|
||||
s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc )
|
||||
s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c )
|
||||
s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c )
|
||||
s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c )
|
||||
s.files += %w( src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc )
|
||||
s.files += %w( src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc )
|
||||
|
|
|
|||
4
grpc.gyp
4
grpc.gyp
|
|
@ -533,6 +533,8 @@
|
|||
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
|
||||
'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
|
||||
|
|
@ -1262,6 +1264,8 @@
|
|||
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
|
||||
'third_party/nanopb/pb_common.c',
|
||||
'third_party/nanopb/pb_decode.c',
|
||||
|
|
|
|||
|
|
@ -724,6 +724,8 @@
|
|||
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc" role="src" />
|
||||
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc" role="src" />
|
||||
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc" role="src" />
|
||||
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c" role="src" />
|
||||
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c" role="src" />
|
||||
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c" role="src" />
|
||||
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc" role="src" />
|
||||
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc" role="src" />
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ grpc_grpclb_request* grpc_grpclb_request_create(const char* lb_service_name) {
|
|||
}
|
||||
|
||||
static void populate_timestamp(gpr_timespec timestamp,
|
||||
struct _grpc_lb_v1_Timestamp* timestamp_pb) {
|
||||
grpc_grpclb_timestamp* timestamp_pb) {
|
||||
timestamp_pb->has_seconds = true;
|
||||
timestamp_pb->seconds = timestamp.tv_sec;
|
||||
timestamp_pb->has_nanos = true;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,9 @@ typedef grpc_lb_v1_Server_ip_address_t grpc_grpclb_ip_address;
|
|||
typedef grpc_lb_v1_LoadBalanceRequest grpc_grpclb_request;
|
||||
typedef grpc_lb_v1_InitialLoadBalanceResponse grpc_grpclb_initial_response;
|
||||
typedef grpc_lb_v1_Server grpc_grpclb_server;
|
||||
typedef grpc_lb_v1_Duration grpc_grpclb_duration;
|
||||
typedef google_protobuf_Duration grpc_grpclb_duration;
|
||||
typedef google_protobuf_Timestamp grpc_grpclb_timestamp;
|
||||
|
||||
typedef struct {
|
||||
grpc_grpclb_server** servers;
|
||||
size_t num_servers;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
/* Automatically generated nanopb constant definitions */
|
||||
/* Generated by nanopb-0.3.7-dev */
|
||||
|
||||
#include "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h"
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
const pb_field_t google_protobuf_Duration_fields[3] = {
|
||||
PB_FIELD( 1, INT64 , OPTIONAL, STATIC , FIRST, google_protobuf_Duration, seconds, seconds, 0),
|
||||
PB_FIELD( 2, INT32 , OPTIONAL, STATIC , OTHER, google_protobuf_Duration, nanos, seconds, 0),
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
|
||||
/* @@protoc_insertion_point(eof) */
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
/* Automatically generated nanopb header */
|
||||
/* Generated by nanopb-0.3.7-dev */
|
||||
|
||||
#ifndef PB_GOOGLE_PROTOBUF_DURATION_PB_H_INCLUDED
|
||||
#define PB_GOOGLE_PROTOBUF_DURATION_PB_H_INCLUDED
|
||||
#include "pb.h"
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Struct definitions */
|
||||
typedef struct _google_protobuf_Duration {
|
||||
bool has_seconds;
|
||||
int64_t seconds;
|
||||
bool has_nanos;
|
||||
int32_t nanos;
|
||||
/* @@protoc_insertion_point(struct:google_protobuf_Duration) */
|
||||
} google_protobuf_Duration;
|
||||
|
||||
/* Default values for struct fields */
|
||||
|
||||
/* Initializer values for message structs */
|
||||
#define google_protobuf_Duration_init_default {false, 0, false, 0}
|
||||
#define google_protobuf_Duration_init_zero {false, 0, false, 0}
|
||||
|
||||
/* Field tags (for use in manual encoding/decoding) */
|
||||
#define google_protobuf_Duration_seconds_tag 1
|
||||
#define google_protobuf_Duration_nanos_tag 2
|
||||
|
||||
/* Struct field encoding specification for nanopb */
|
||||
extern const pb_field_t google_protobuf_Duration_fields[3];
|
||||
|
||||
/* Maximum encoded size of messages (where known) */
|
||||
#define google_protobuf_Duration_size 22
|
||||
|
||||
/* Message IDs (where set with "msgid" option) */
|
||||
#ifdef PB_MSGID
|
||||
|
||||
#define DURATION_MESSAGES \
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
/* @@protoc_insertion_point(eof) */
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
/* Automatically generated nanopb constant definitions */
|
||||
/* Generated by nanopb-0.3.7-dev */
|
||||
|
||||
#include "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h"
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
const pb_field_t google_protobuf_Timestamp_fields[3] = {
|
||||
PB_FIELD( 1, INT64 , OPTIONAL, STATIC , FIRST, google_protobuf_Timestamp, seconds, seconds, 0),
|
||||
PB_FIELD( 2, INT32 , OPTIONAL, STATIC , OTHER, google_protobuf_Timestamp, nanos, seconds, 0),
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
|
||||
/* @@protoc_insertion_point(eof) */
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
/* Automatically generated nanopb header */
|
||||
/* Generated by nanopb-0.3.7-dev */
|
||||
|
||||
#ifndef PB_GOOGLE_PROTOBUF_TIMESTAMP_PB_H_INCLUDED
|
||||
#define PB_GOOGLE_PROTOBUF_TIMESTAMP_PB_H_INCLUDED
|
||||
#include "pb.h"
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Struct definitions */
|
||||
typedef struct _google_protobuf_Timestamp {
|
||||
bool has_seconds;
|
||||
int64_t seconds;
|
||||
bool has_nanos;
|
||||
int32_t nanos;
|
||||
/* @@protoc_insertion_point(struct:google_protobuf_Timestamp) */
|
||||
} google_protobuf_Timestamp;
|
||||
|
||||
/* Default values for struct fields */
|
||||
|
||||
/* Initializer values for message structs */
|
||||
#define google_protobuf_Timestamp_init_default {false, 0, false, 0}
|
||||
#define google_protobuf_Timestamp_init_zero {false, 0, false, 0}
|
||||
|
||||
/* Field tags (for use in manual encoding/decoding) */
|
||||
#define google_protobuf_Timestamp_seconds_tag 1
|
||||
#define google_protobuf_Timestamp_nanos_tag 2
|
||||
|
||||
/* Struct field encoding specification for nanopb */
|
||||
extern const pb_field_t google_protobuf_Timestamp_fields[3];
|
||||
|
||||
/* Maximum encoded size of messages (where known) */
|
||||
#define google_protobuf_Timestamp_size 22
|
||||
|
||||
/* Message IDs (where set with "msgid" option) */
|
||||
#ifdef PB_MSGID
|
||||
|
||||
#define TIMESTAMP_MESSAGES \
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
/* @@protoc_insertion_point(eof) */
|
||||
|
||||
#endif
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
/* Generated by nanopb-0.3.7-dev */
|
||||
|
||||
#include "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h"
|
||||
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
|
|
@ -10,18 +9,6 @@
|
|||
|
||||
|
||||
|
||||
const pb_field_t grpc_lb_v1_Duration_fields[3] = {
|
||||
PB_FIELD( 1, INT64 , OPTIONAL, STATIC , FIRST, grpc_lb_v1_Duration, seconds, seconds, 0),
|
||||
PB_FIELD( 2, INT32 , OPTIONAL, STATIC , OTHER, grpc_lb_v1_Duration, nanos, seconds, 0),
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
const pb_field_t grpc_lb_v1_Timestamp_fields[3] = {
|
||||
PB_FIELD( 1, INT64 , OPTIONAL, STATIC , FIRST, grpc_lb_v1_Timestamp, seconds, seconds, 0),
|
||||
PB_FIELD( 2, INT32 , OPTIONAL, STATIC , OTHER, grpc_lb_v1_Timestamp, nanos, seconds, 0),
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
const pb_field_t grpc_lb_v1_LoadBalanceRequest_fields[3] = {
|
||||
PB_FIELD( 1, MESSAGE , OPTIONAL, STATIC , FIRST, grpc_lb_v1_LoadBalanceRequest, initial_request, initial_request, &grpc_lb_v1_InitialLoadBalanceRequest_fields),
|
||||
PB_FIELD( 2, MESSAGE , OPTIONAL, STATIC , OTHER, grpc_lb_v1_LoadBalanceRequest, client_stats, initial_request, &grpc_lb_v1_ClientStats_fields),
|
||||
|
|
@ -40,7 +27,7 @@ const pb_field_t grpc_lb_v1_ClientStatsPerToken_fields[3] = {
|
|||
};
|
||||
|
||||
const pb_field_t grpc_lb_v1_ClientStats_fields[7] = {
|
||||
PB_FIELD( 1, MESSAGE , OPTIONAL, STATIC , FIRST, grpc_lb_v1_ClientStats, timestamp, timestamp, &grpc_lb_v1_Timestamp_fields),
|
||||
PB_FIELD( 1, MESSAGE , OPTIONAL, STATIC , FIRST, grpc_lb_v1_ClientStats, timestamp, timestamp, &google_protobuf_Timestamp_fields),
|
||||
PB_FIELD( 2, INT64 , OPTIONAL, STATIC , OTHER, grpc_lb_v1_ClientStats, num_calls_started, timestamp, 0),
|
||||
PB_FIELD( 3, INT64 , OPTIONAL, STATIC , OTHER, grpc_lb_v1_ClientStats, num_calls_finished, num_calls_started, 0),
|
||||
PB_FIELD( 6, INT64 , OPTIONAL, STATIC , OTHER, grpc_lb_v1_ClientStats, num_calls_finished_with_client_failed_to_send, num_calls_finished, 0),
|
||||
|
|
@ -57,7 +44,7 @@ const pb_field_t grpc_lb_v1_LoadBalanceResponse_fields[3] = {
|
|||
|
||||
const pb_field_t grpc_lb_v1_InitialLoadBalanceResponse_fields[3] = {
|
||||
PB_FIELD( 1, STRING , OPTIONAL, STATIC , FIRST, grpc_lb_v1_InitialLoadBalanceResponse, load_balancer_delegate, load_balancer_delegate, 0),
|
||||
PB_FIELD( 2, MESSAGE , OPTIONAL, STATIC , OTHER, grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval, load_balancer_delegate, &grpc_lb_v1_Duration_fields),
|
||||
PB_FIELD( 2, MESSAGE , OPTIONAL, STATIC , OTHER, grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval, load_balancer_delegate, &google_protobuf_Duration_fields),
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
|
|
@ -84,7 +71,7 @@ const pb_field_t grpc_lb_v1_Server_fields[5] = {
|
|||
* numbers or field sizes that are larger than what can fit in 8 or 16 bit
|
||||
* field descriptors.
|
||||
*/
|
||||
PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 65536 && pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 65536 && pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 65536 && pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval) < 65536 && pb_membersize(grpc_lb_v1_ServerList, servers) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server)
|
||||
PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 65536 && pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 65536 && pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 65536 && pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval) < 65536 && pb_membersize(grpc_lb_v1_ServerList, servers) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server)
|
||||
#endif
|
||||
|
||||
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
|
||||
|
|
@ -95,7 +82,7 @@ PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request)
|
|||
* numbers or field sizes that are larger than what can fit in the default
|
||||
* 8 bit descriptors.
|
||||
*/
|
||||
PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 256 && pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 256 && pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 256 && pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval) < 256 && pb_membersize(grpc_lb_v1_ServerList, servers) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server)
|
||||
PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 256 && pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 256 && pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 256 && pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval) < 256 && pb_membersize(grpc_lb_v1_ServerList, servers) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server)
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
#ifndef PB_GRPC_LB_V1_LOAD_BALANCER_PB_H_INCLUDED
|
||||
#define PB_GRPC_LB_V1_LOAD_BALANCER_PB_H_INCLUDED
|
||||
#include "pb.h"
|
||||
#include "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h"
|
||||
#include "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h"
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
|
|
@ -19,6 +21,21 @@ typedef struct _grpc_lb_v1_ServerList {
|
|||
/* @@protoc_insertion_point(struct:grpc_lb_v1_ServerList) */
|
||||
} grpc_lb_v1_ServerList;
|
||||
|
||||
typedef struct _grpc_lb_v1_ClientStats {
|
||||
bool has_timestamp;
|
||||
google_protobuf_Timestamp timestamp;
|
||||
bool has_num_calls_started;
|
||||
int64_t num_calls_started;
|
||||
bool has_num_calls_finished;
|
||||
int64_t num_calls_finished;
|
||||
bool has_num_calls_finished_with_client_failed_to_send;
|
||||
int64_t num_calls_finished_with_client_failed_to_send;
|
||||
bool has_num_calls_finished_known_received;
|
||||
int64_t num_calls_finished_known_received;
|
||||
pb_callback_t calls_finished_with_drop;
|
||||
/* @@protoc_insertion_point(struct:grpc_lb_v1_ClientStats) */
|
||||
} grpc_lb_v1_ClientStats;
|
||||
|
||||
typedef struct _grpc_lb_v1_ClientStatsPerToken {
|
||||
pb_callback_t load_balance_token;
|
||||
bool has_num_calls;
|
||||
|
|
@ -26,20 +43,20 @@ typedef struct _grpc_lb_v1_ClientStatsPerToken {
|
|||
/* @@protoc_insertion_point(struct:grpc_lb_v1_ClientStatsPerToken) */
|
||||
} grpc_lb_v1_ClientStatsPerToken;
|
||||
|
||||
typedef struct _grpc_lb_v1_Duration {
|
||||
bool has_seconds;
|
||||
int64_t seconds;
|
||||
bool has_nanos;
|
||||
int32_t nanos;
|
||||
/* @@protoc_insertion_point(struct:grpc_lb_v1_Duration) */
|
||||
} grpc_lb_v1_Duration;
|
||||
|
||||
typedef struct _grpc_lb_v1_InitialLoadBalanceRequest {
|
||||
bool has_name;
|
||||
char name[128];
|
||||
/* @@protoc_insertion_point(struct:grpc_lb_v1_InitialLoadBalanceRequest) */
|
||||
} grpc_lb_v1_InitialLoadBalanceRequest;
|
||||
|
||||
typedef struct _grpc_lb_v1_InitialLoadBalanceResponse {
|
||||
bool has_load_balancer_delegate;
|
||||
char load_balancer_delegate[64];
|
||||
bool has_client_stats_report_interval;
|
||||
google_protobuf_Duration client_stats_report_interval;
|
||||
/* @@protoc_insertion_point(struct:grpc_lb_v1_InitialLoadBalanceResponse) */
|
||||
} grpc_lb_v1_InitialLoadBalanceResponse;
|
||||
|
||||
typedef PB_BYTES_ARRAY_T(16) grpc_lb_v1_Server_ip_address_t;
|
||||
typedef struct _grpc_lb_v1_Server {
|
||||
bool has_ip_address;
|
||||
|
|
@ -53,37 +70,6 @@ typedef struct _grpc_lb_v1_Server {
|
|||
/* @@protoc_insertion_point(struct:grpc_lb_v1_Server) */
|
||||
} grpc_lb_v1_Server;
|
||||
|
||||
typedef struct _grpc_lb_v1_Timestamp {
|
||||
bool has_seconds;
|
||||
int64_t seconds;
|
||||
bool has_nanos;
|
||||
int32_t nanos;
|
||||
/* @@protoc_insertion_point(struct:grpc_lb_v1_Timestamp) */
|
||||
} grpc_lb_v1_Timestamp;
|
||||
|
||||
typedef struct _grpc_lb_v1_ClientStats {
|
||||
bool has_timestamp;
|
||||
grpc_lb_v1_Timestamp timestamp;
|
||||
bool has_num_calls_started;
|
||||
int64_t num_calls_started;
|
||||
bool has_num_calls_finished;
|
||||
int64_t num_calls_finished;
|
||||
bool has_num_calls_finished_with_client_failed_to_send;
|
||||
int64_t num_calls_finished_with_client_failed_to_send;
|
||||
bool has_num_calls_finished_known_received;
|
||||
int64_t num_calls_finished_known_received;
|
||||
pb_callback_t calls_finished_with_drop;
|
||||
/* @@protoc_insertion_point(struct:grpc_lb_v1_ClientStats) */
|
||||
} grpc_lb_v1_ClientStats;
|
||||
|
||||
typedef struct _grpc_lb_v1_InitialLoadBalanceResponse {
|
||||
bool has_load_balancer_delegate;
|
||||
char load_balancer_delegate[64];
|
||||
bool has_client_stats_report_interval;
|
||||
grpc_lb_v1_Duration client_stats_report_interval;
|
||||
/* @@protoc_insertion_point(struct:grpc_lb_v1_InitialLoadBalanceResponse) */
|
||||
} grpc_lb_v1_InitialLoadBalanceResponse;
|
||||
|
||||
typedef struct _grpc_lb_v1_LoadBalanceRequest {
|
||||
bool has_initial_request;
|
||||
grpc_lb_v1_InitialLoadBalanceRequest initial_request;
|
||||
|
|
@ -103,56 +89,46 @@ typedef struct _grpc_lb_v1_LoadBalanceResponse {
|
|||
/* Default values for struct fields */
|
||||
|
||||
/* Initializer values for message structs */
|
||||
#define grpc_lb_v1_Duration_init_default {false, 0, false, 0}
|
||||
#define grpc_lb_v1_Timestamp_init_default {false, 0, false, 0}
|
||||
#define grpc_lb_v1_LoadBalanceRequest_init_default {false, grpc_lb_v1_InitialLoadBalanceRequest_init_default, false, grpc_lb_v1_ClientStats_init_default}
|
||||
#define grpc_lb_v1_InitialLoadBalanceRequest_init_default {false, ""}
|
||||
#define grpc_lb_v1_ClientStatsPerToken_init_default {{{NULL}, NULL}, false, 0}
|
||||
#define grpc_lb_v1_ClientStats_init_default {false, grpc_lb_v1_Timestamp_init_default, false, 0, false, 0, false, 0, false, 0, {{NULL}, NULL}}
|
||||
#define grpc_lb_v1_ClientStats_init_default {false, google_protobuf_Timestamp_init_default, false, 0, false, 0, false, 0, false, 0, {{NULL}, NULL}}
|
||||
#define grpc_lb_v1_LoadBalanceResponse_init_default {false, grpc_lb_v1_InitialLoadBalanceResponse_init_default, false, grpc_lb_v1_ServerList_init_default}
|
||||
#define grpc_lb_v1_InitialLoadBalanceResponse_init_default {false, "", false, grpc_lb_v1_Duration_init_default}
|
||||
#define grpc_lb_v1_InitialLoadBalanceResponse_init_default {false, "", false, google_protobuf_Duration_init_default}
|
||||
#define grpc_lb_v1_ServerList_init_default {{{NULL}, NULL}}
|
||||
#define grpc_lb_v1_Server_init_default {false, {0, {0}}, false, 0, false, "", false, 0}
|
||||
#define grpc_lb_v1_Duration_init_zero {false, 0, false, 0}
|
||||
#define grpc_lb_v1_Timestamp_init_zero {false, 0, false, 0}
|
||||
#define grpc_lb_v1_LoadBalanceRequest_init_zero {false, grpc_lb_v1_InitialLoadBalanceRequest_init_zero, false, grpc_lb_v1_ClientStats_init_zero}
|
||||
#define grpc_lb_v1_InitialLoadBalanceRequest_init_zero {false, ""}
|
||||
#define grpc_lb_v1_ClientStatsPerToken_init_zero {{{NULL}, NULL}, false, 0}
|
||||
#define grpc_lb_v1_ClientStats_init_zero {false, grpc_lb_v1_Timestamp_init_zero, false, 0, false, 0, false, 0, false, 0, {{NULL}, NULL}}
|
||||
#define grpc_lb_v1_ClientStats_init_zero {false, google_protobuf_Timestamp_init_zero, false, 0, false, 0, false, 0, false, 0, {{NULL}, NULL}}
|
||||
#define grpc_lb_v1_LoadBalanceResponse_init_zero {false, grpc_lb_v1_InitialLoadBalanceResponse_init_zero, false, grpc_lb_v1_ServerList_init_zero}
|
||||
#define grpc_lb_v1_InitialLoadBalanceResponse_init_zero {false, "", false, grpc_lb_v1_Duration_init_zero}
|
||||
#define grpc_lb_v1_InitialLoadBalanceResponse_init_zero {false, "", false, google_protobuf_Duration_init_zero}
|
||||
#define grpc_lb_v1_ServerList_init_zero {{{NULL}, NULL}}
|
||||
#define grpc_lb_v1_Server_init_zero {false, {0, {0}}, false, 0, false, "", false, 0}
|
||||
|
||||
/* Field tags (for use in manual encoding/decoding) */
|
||||
#define grpc_lb_v1_ServerList_servers_tag 1
|
||||
#define grpc_lb_v1_ClientStatsPerToken_load_balance_token_tag 1
|
||||
#define grpc_lb_v1_ClientStatsPerToken_num_calls_tag 2
|
||||
#define grpc_lb_v1_Duration_seconds_tag 1
|
||||
#define grpc_lb_v1_Duration_nanos_tag 2
|
||||
#define grpc_lb_v1_InitialLoadBalanceRequest_name_tag 1
|
||||
#define grpc_lb_v1_Server_ip_address_tag 1
|
||||
#define grpc_lb_v1_Server_port_tag 2
|
||||
#define grpc_lb_v1_Server_load_balance_token_tag 3
|
||||
#define grpc_lb_v1_Server_drop_tag 4
|
||||
#define grpc_lb_v1_Timestamp_seconds_tag 1
|
||||
#define grpc_lb_v1_Timestamp_nanos_tag 2
|
||||
#define grpc_lb_v1_ClientStats_timestamp_tag 1
|
||||
#define grpc_lb_v1_ClientStats_num_calls_started_tag 2
|
||||
#define grpc_lb_v1_ClientStats_num_calls_finished_tag 3
|
||||
#define grpc_lb_v1_ClientStats_num_calls_finished_with_client_failed_to_send_tag 6
|
||||
#define grpc_lb_v1_ClientStats_num_calls_finished_known_received_tag 7
|
||||
#define grpc_lb_v1_ClientStats_calls_finished_with_drop_tag 8
|
||||
#define grpc_lb_v1_ClientStatsPerToken_load_balance_token_tag 1
|
||||
#define grpc_lb_v1_ClientStatsPerToken_num_calls_tag 2
|
||||
#define grpc_lb_v1_InitialLoadBalanceRequest_name_tag 1
|
||||
#define grpc_lb_v1_InitialLoadBalanceResponse_load_balancer_delegate_tag 1
|
||||
#define grpc_lb_v1_InitialLoadBalanceResponse_client_stats_report_interval_tag 2
|
||||
#define grpc_lb_v1_Server_ip_address_tag 1
|
||||
#define grpc_lb_v1_Server_port_tag 2
|
||||
#define grpc_lb_v1_Server_load_balance_token_tag 3
|
||||
#define grpc_lb_v1_Server_drop_tag 4
|
||||
#define grpc_lb_v1_LoadBalanceRequest_initial_request_tag 1
|
||||
#define grpc_lb_v1_LoadBalanceRequest_client_stats_tag 2
|
||||
#define grpc_lb_v1_LoadBalanceResponse_initial_response_tag 1
|
||||
#define grpc_lb_v1_LoadBalanceResponse_server_list_tag 2
|
||||
|
||||
/* Struct field encoding specification for nanopb */
|
||||
extern const pb_field_t grpc_lb_v1_Duration_fields[3];
|
||||
extern const pb_field_t grpc_lb_v1_Timestamp_fields[3];
|
||||
extern const pb_field_t grpc_lb_v1_LoadBalanceRequest_fields[3];
|
||||
extern const pb_field_t grpc_lb_v1_InitialLoadBalanceRequest_fields[2];
|
||||
extern const pb_field_t grpc_lb_v1_ClientStatsPerToken_fields[3];
|
||||
|
|
@ -163,8 +139,6 @@ extern const pb_field_t grpc_lb_v1_ServerList_fields[2];
|
|||
extern const pb_field_t grpc_lb_v1_Server_fields[5];
|
||||
|
||||
/* Maximum encoded size of messages (where known) */
|
||||
#define grpc_lb_v1_Duration_size 22
|
||||
#define grpc_lb_v1_Timestamp_size 22
|
||||
#define grpc_lb_v1_LoadBalanceRequest_size (140 + grpc_lb_v1_ClientStats_size)
|
||||
#define grpc_lb_v1_InitialLoadBalanceRequest_size 131
|
||||
/* grpc_lb_v1_ClientStatsPerToken_size depends on runtime parameters */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
/* Generated by nanopb-0.3.7-dev */
|
||||
|
||||
#include "src/core/tsi/alts/handshaker/altscontext.pb.h"
|
||||
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
#define PB_GRPC_GCP_ALTSCONTEXT_PB_H_INCLUDED
|
||||
#include "pb.h"
|
||||
#include "src/core/tsi/alts/handshaker/transport_security_common.pb.h"
|
||||
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
/* Generated by nanopb-0.3.7-dev */
|
||||
|
||||
#include "src/core/tsi/alts/handshaker/handshaker.pb.h"
|
||||
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
#define PB_GRPC_GCP_HANDSHAKER_PB_H_INCLUDED
|
||||
#include "pb.h"
|
||||
#include "src/core/tsi/alts/handshaker/transport_security_common.pb.h"
|
||||
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
/* Generated by nanopb-0.3.7-dev */
|
||||
|
||||
#include "src/core/tsi/alts/handshaker/transport_security_common.pb.h"
|
||||
|
||||
/* @@protoc_insertion_point(includes) */
|
||||
#if PB_PROTO_HEADER_VERSION != 30
|
||||
#error Regenerate this file with the current version of nanopb generator.
|
||||
|
|
|
|||
|
|
@ -23,7 +23,10 @@ grpc_package(
|
|||
|
||||
grpc_proto_library(
|
||||
name = "load_balancer_proto",
|
||||
srcs = ["load_balancer.proto"],
|
||||
srcs = [
|
||||
"load_balancer.proto",
|
||||
],
|
||||
well_known_protos = True,
|
||||
)
|
||||
|
||||
grpc_proto_library(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright 2016 gRPC authors.
|
||||
// Copyright 2015 The gRPC Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
|
|
@ -12,42 +12,25 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// This file defines the GRPCLB LoadBalancing protocol.
|
||||
//
|
||||
// The canonical version of this proto can be found at
|
||||
// https://github.com/grpc/grpc-proto/blob/master/grpc/lb/v1/load_balancer.proto
|
||||
syntax = "proto3";
|
||||
|
||||
package grpc.lb.v1;
|
||||
|
||||
message Duration {
|
||||
// Signed seconds of the span of time. Must be from -315,576,000,000
|
||||
// to +315,576,000,000 inclusive.
|
||||
int64 seconds = 1;
|
||||
import "google/protobuf/duration.proto";
|
||||
import "google/protobuf/timestamp.proto";
|
||||
|
||||
// Signed fractions of a second at nanosecond resolution of the span
|
||||
// of time. Durations less than one second are represented with a 0
|
||||
// `seconds` field and a positive or negative `nanos` field. For durations
|
||||
// of one second or more, a non-zero value for the `nanos` field must be
|
||||
// of the same sign as the `seconds` field. Must be from -999,999,999
|
||||
// to +999,999,999 inclusive.
|
||||
int32 nanos = 2;
|
||||
}
|
||||
|
||||
message Timestamp {
|
||||
|
||||
// Represents seconds of UTC time since Unix epoch
|
||||
// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
|
||||
// 9999-12-31T23:59:59Z inclusive.
|
||||
int64 seconds = 1;
|
||||
|
||||
// Non-negative fractions of a second at nanosecond resolution. Negative
|
||||
// second values with fractions must still have non-negative nanos values
|
||||
// that count forward in time. Must be from 0 to 999,999,999
|
||||
// inclusive.
|
||||
int32 nanos = 2;
|
||||
}
|
||||
option go_package = "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1";
|
||||
option java_multiple_files = true;
|
||||
option java_outer_classname = "LoadBalancerProto";
|
||||
option java_package = "io.grpc.grpclb";
|
||||
|
||||
service LoadBalancer {
|
||||
// Bidirectional rpc to get a list of servers.
|
||||
rpc BalanceLoad(stream LoadBalanceRequest)
|
||||
returns (stream LoadBalanceResponse);
|
||||
rpc BalanceLoad(stream LoadBalanceRequest) returns (stream LoadBalanceResponse);
|
||||
}
|
||||
|
||||
message LoadBalanceRequest {
|
||||
|
|
@ -62,8 +45,8 @@ message LoadBalanceRequest {
|
|||
}
|
||||
|
||||
message InitialLoadBalanceRequest {
|
||||
// The name of the load balanced service (e.g., balancer.service.com). The max
|
||||
// length of the name is 256 bytes.
|
||||
// The name of the load balanced service (e.g., service.googleapis.com). Its
|
||||
// length should be less than 256 bytes.
|
||||
// The name might include a port number. How to handle the port number is up
|
||||
// to the balancer.
|
||||
string name = 1;
|
||||
|
|
@ -82,7 +65,7 @@ message ClientStatsPerToken {
|
|||
// count except the timestamp should be reset to zero after reporting the stats.
|
||||
message ClientStats {
|
||||
// The timestamp of generating the report.
|
||||
Timestamp timestamp = 1;
|
||||
google.protobuf.Timestamp timestamp = 1;
|
||||
|
||||
// The total number of RPCs that started.
|
||||
int64 num_calls_started = 2;
|
||||
|
|
@ -125,7 +108,7 @@ message InitialLoadBalanceResponse {
|
|||
// This interval defines how often the client should send the client stats
|
||||
// to the load balancer. Stats should only be reported when the duration is
|
||||
// positive.
|
||||
Duration client_stats_report_interval = 2;
|
||||
google.protobuf.Duration client_stats_report_interval = 2;
|
||||
}
|
||||
|
||||
message ServerList {
|
||||
|
|
@ -149,13 +132,13 @@ message Server {
|
|||
// A resolved port number for the server.
|
||||
int32 port = 2;
|
||||
|
||||
// An opaque but printable token given to the frontend for each pick. All
|
||||
// frontend requests for that pick must include the token in its initial
|
||||
// metadata. The token is used by the backend to verify the request and to
|
||||
// allow the backend to report load to the gRPC LB system. The token is also
|
||||
// used in client stats for reporting dropped calls.
|
||||
// An opaque but printable token for load reporting. The client must include
|
||||
// the token of the picked server into the initial metadata when it starts a
|
||||
// call to that server. The token is used by the server to verify the request
|
||||
// and to allow the server to report load to the gRPC LB system. The token is
|
||||
// also used in client stats for reporting dropped calls.
|
||||
//
|
||||
// Its length is variable but less than 50 bytes.
|
||||
// Its length can be variable but must be less than 50 bytes.
|
||||
string load_balance_token = 3;
|
||||
|
||||
// Indicates whether this particular request should be dropped by the client.
|
||||
|
|
|
|||
|
|
@ -341,6 +341,8 @@ CORE_SOURCE_FILES = [
|
|||
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
|
||||
'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
|
||||
'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
|
||||
|
|
|
|||
|
|
@ -68,29 +68,14 @@ popd
|
|||
|
||||
# this should be the same version as the submodule we compile against
|
||||
# ideally we'd update this as a template to ensure that
|
||||
pip install protobuf==3.5.0.post1
|
||||
pip install protobuf==3.5.2
|
||||
|
||||
pushd "$(dirname $INPUT_PROTO)" > /dev/null
|
||||
|
||||
protoc \
|
||||
--plugin=protoc-gen-nanopb="$GRPC_ROOT/third_party/nanopb/generator/protoc-gen-nanopb" \
|
||||
--nanopb_out='-T -L#include\ \"pb.h\"'":$OUTPUT_DIR" "$(basename $INPUT_PROTO)"
|
||||
|
||||
readonly PROTO_BASENAME=$(basename $INPUT_PROTO .proto)
|
||||
sed -i "s:$PROTO_BASENAME.pb.h:${GRPC_OUTPUT_DIR}/$PROTO_BASENAME.pb.h:g" \
|
||||
"$OUTPUT_DIR/$PROTO_BASENAME.pb.c"
|
||||
|
||||
if [ $PROTO_BASENAME == "handshaker" ] || [ $PROTO_BASENAME == "altscontext" ]; then
|
||||
sed -i "s:transport_security_common.pb.h:${GRPC_OUTPUT_DIR}/transport_security_common.pb.h:g" \
|
||||
"$OUTPUT_DIR/$PROTO_BASENAME.pb.h"
|
||||
fi
|
||||
|
||||
# Fix up the include guards such that they pass the check_include_guards.py
|
||||
# test. Assumes that the generated files are being placed in gRPC src dir.
|
||||
readonly INCLUDE_GUARD_BASE=`echo $GRPC_OUTPUT_DIR | tr [a-z/] [A-Z_] | sed s:^.*SRC_::`
|
||||
readonly UC_PROTO_BASENAME=`echo $PROTO_BASENAME | tr [a-z] [A-Z]`
|
||||
sed -i "s:PB_${UC_PROTO_BASENAME}_PB_H_INCLUDED:GRPC_${INCLUDE_GUARD_BASE}_${UC_PROTO_BASENAME}_PB_H:g" \
|
||||
"$OUTPUT_DIR/$PROTO_BASENAME.pb.h"
|
||||
--nanopb_out='-T -Q#include\ \"'"${GRPC_OUTPUT_DIR}"'/%s\" -L#include\ \"pb.h\"'":$OUTPUT_DIR" \
|
||||
"$(basename $INPUT_PROTO)"
|
||||
|
||||
deactivate
|
||||
rm -rf $VENV_DIR
|
||||
|
|
|
|||
|
|
@ -77,6 +77,10 @@ _EXEMPT = frozenset((
|
|||
'examples/python/route_guide/route_guide_pb2_grpc.py',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c',
|
||||
'src/core/tsi/alts/handshaker/altscontext.pb.h',
|
||||
'src/core/tsi/alts/handshaker/altscontext.pb.c',
|
||||
'src/core/tsi/alts/handshaker/handshaker.pb.h',
|
||||
|
|
|
|||
|
|
@ -157,6 +157,8 @@ args = argp.parse_args()
|
|||
|
||||
KNOWN_BAD = set([
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h',
|
||||
'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h',
|
||||
'src/core/tsi/alts/handshaker/altscontext.pb.h',
|
||||
'src/core/tsi/alts/handshaker/handshaker.pb.h',
|
||||
'src/core/tsi/alts/handshaker/transport_security_common.pb.h',
|
||||
|
|
|
|||
|
|
@ -51,6 +51,16 @@ readonly LOAD_BALANCER_GRPC_OUTPUT_PATH='src/core/ext/filters/client_channel/lb_
|
|||
"$NANOPB_TMP_OUTPUT" \
|
||||
"$LOAD_BALANCER_GRPC_OUTPUT_PATH"
|
||||
|
||||
./tools/codegen/core/gen_nano_proto.sh \
|
||||
third_party/protobuf/src/google/protobuf/duration.proto \
|
||||
"$NANOPB_TMP_OUTPUT/google/protobuf" \
|
||||
"$LOAD_BALANCER_GRPC_OUTPUT_PATH/google/protobuf"
|
||||
|
||||
./tools/codegen/core/gen_nano_proto.sh \
|
||||
third_party/protobuf/src/google/protobuf/timestamp.proto \
|
||||
"$NANOPB_TMP_OUTPUT/google/protobuf" \
|
||||
"$LOAD_BALANCER_GRPC_OUTPUT_PATH/google/protobuf"
|
||||
|
||||
# compare outputs to checked compiled code
|
||||
if ! diff -r "$NANOPB_TMP_OUTPUT" src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1; then
|
||||
echo "Outputs differ: $NANOPB_TMP_OUTPUT vs $LOAD_BALANCER_GRPC_OUTPUT_PATH"
|
||||
|
|
|
|||
|
|
@ -890,6 +890,8 @@ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
|
|||
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
|
||||
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h \
|
||||
src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
|
||||
|
|
|
|||
|
|
@ -9974,6 +9974,8 @@
|
|||
"src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h"
|
||||
],
|
||||
|
|
@ -10011,6 +10013,8 @@
|
|||
"src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c",
|
||||
"src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h"
|
||||
],
|
||||
|
|
|
|||
Loading…
Reference in New Issue