ZHmao · ZHmao · Feb 9, 2020 · Jan 24, 2020 · Feb 2, 2020 · Feb 3, 2020
diff --git a/BUILDING.md b/BUILDING.md
@@ -161,10 +161,11 @@ Please note that when using Ninja, you will still need Visual C++ (part of Visua
 installed to be able to compile the C/C++ sources.
 ```
 > @rem Run from grpc directory after cloning the repo with --recursive or updating submodules.
-> md .build
-> cd .build
+> cd cmake
+> md build
+> cd build
 > call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64
-> cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release
+> cmake ..\.. -GNinja -DCMAKE_BUILD_TYPE=Release
 > cmake --build .
 ```
 
@@ -183,7 +184,7 @@ ie `gRPC_CARES_PROVIDER`.
 ### Install after build
 
 Perform the following steps to install gRPC using CMake.
-* Set `gRPC_INSTALL` to `ON`
+* Set `-DgRPC_INSTALL=ON`
 * Build the `install` target
 
 The install destination is controlled by the
@@ -196,16 +197,21 @@ in "module" mode and install them alongside gRPC in a single step.
 If you are using an older version of gRPC, you will need to select "package"
 mode (rather than "module" mode) for the dependencies.
 This means you will need to have external copies of these libraries available
-on your system.
+on your system. This [example](test/distrib/cpp/run_distrib_test_cmake.sh) shows
+how to install dependencies with cmake before proceeding to installing gRPC itself. 
+
 ```
-$ cmake .. -DgRPC_CARES_PROVIDER=package    \
-           -DgRPC_PROTOBUF_PROVIDER=package \
-           -DgRPC_SSL_PROVIDER=package      \
-           -DgRPC_ZLIB_PROVIDER=package
+# NOTE: all of gRPC's dependencies need to be already installed
+$ cmake ../.. -DgRPC_INSTALL=ON                \
+              -DCMAKE_BUILD_TYPE=Release       \
+              -DgRPC_ABSL_PROVIDER=package     \
+              -DgRPC_CARES_PROVIDER=package    \
+              -DgRPC_PROTOBUF_PROVIDER=package \
+              -DgRPC_SSL_PROVIDER=package      \
+              -DgRPC_ZLIB_PROVIDER=package
 $ make
 $ make install
 ```
-[Example](test/distrib/cpp/run_distrib_test_cmake.sh)
 
 ### Cross-compiling
 
@@ -222,7 +228,7 @@ that will be used for this build.
 This toolchain file is specified to CMake by setting the `CMAKE_TOOLCHAIN_FILE`
 variable.
 ```
-$ cmake .. -DCMAKE_TOOLCHAIN_FILE=path/to/file
+$ cmake ../.. -DCMAKE_TOOLCHAIN_FILE=path/to/file
 $ make
 ```
 

diff --git a/bazel/cc_grpc_library.bzl b/bazel/cc_grpc_library.bzl
@@ -1,5 +1,6 @@
 """Generates and compiles C++ grpc stubs from proto_library rules."""
 
+load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//bazel:generate_cc.bzl", "generate_cc")
 load("//bazel:protobuf.bzl", "well_known_proto_libs")
 
@@ -63,8 +64,7 @@ def cc_grpc_library(
         proto_deps += [dep.split(":")[0] + ":" + "_" + dep.split(":")[1] + "_only" for dep in deps if dep.find(":") != -1]
         if well_known_protos:
             proto_deps += well_known_proto_libs()
-
-        native.proto_library(
+        proto_library(
             name = proto_target,
             srcs = srcs,
             deps = proto_deps,

diff --git a/bazel/generate_cc.bzl b/bazel/generate_cc.bzl
@@ -4,6 +4,7 @@ This is an internal rule used by cc_grpc_library, and shouldn't be used
 directly.
 """
 
+load("@rules_proto//proto:defs.bzl", "ProtoInfo")
 load(
     "//bazel:protobuf.bzl",
     "get_include_directory",

diff --git a/bazel/generate_objc.bzl b/bazel/generate_objc.bzl
@@ -1,3 +1,4 @@
+load("@rules_proto//proto:defs.bzl", "ProtoInfo")
 load(
     "//bazel:protobuf.bzl",
     "get_include_directory",

diff --git a/bazel/protobuf.bzl b/bazel/protobuf.bzl
@@ -1,5 +1,7 @@
 """Utility functions for generating protobuf code."""
 
+load("@rules_proto//proto:defs.bzl", "ProtoInfo")
+
 _PROTO_EXTENSION = ".proto"
 _VIRTUAL_IMPORTS = "/_virtual_imports/"
 

diff --git a/bazel/python_rules.bzl b/bazel/python_rules.bzl
@@ -1,5 +1,6 @@
 """Generates and compiles Python gRPC stubs from proto_library rules."""
 
+load("@rules_proto//proto:defs.bzl", "ProtoInfo")
 load(
     "//bazel:protobuf.bzl",
     "declare_out_files",

diff --git a/bazel/test/python_test_repo/BUILD b/bazel/test/python_test_repo/BUILD
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_proto//proto:defs.bzl", "proto_library")
 load(
     "@com_github_grpc_grpc//bazel:python_rules.bzl",
     "py2and3_test",

diff --git a/doc/environment_variables.md b/doc/environment_variables.md
@@ -4,8 +4,14 @@ gRPC environment variables
 gRPC C core based implementations (those contained in this repository) expose
 some configuration as environment variables that can be set.
 
-* http_proxy
-  The URI of the proxy to use for HTTP CONNECT support.
+* grpc_proxy, https_proxy, http_proxy
+  The URI of the proxy to use for HTTP CONNECT support. These variables are
+  checked in order, and the first one that has a value is used.
+
+* no_grpc_proxy, no_proxy
+  A comma separated list of hostnames to connect to without using a proxy even
+  if a proxy is set. These variables are checked in order, and the first one
+  that has a value is used.
 
 * GRPC_ABORT_ON_LEAKS
   A debugging aid to cause a call to abort() when gRPC objects are leaked past

diff --git a/examples/BUILD b/examples/BUILD
@@ -16,10 +16,11 @@ licenses(["notice"])  # 3-clause BSD
 
 package(default_visibility = ["//visibility:public"])
 
-load("//bazel:grpc_build_system.bzl", "grpc_proto_library")
+load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+load("//bazel:grpc_build_system.bzl", "grpc_proto_library")
 load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
-load("@grpc_python_dependencies//:requirements.bzl", "requirement")
 
 grpc_proto_library(
     name = "auth_sample",

diff --git a/examples/cpp/helloworld/README.md b/examples/cpp/helloworld/README.md
@@ -255,6 +255,10 @@ main loop in `HandleRpcs` to query the queue.
 
 For a working example, refer to [greeter_async_server.cc](greeter_async_server.cc).
 
+#### Flags for the client
 
+```sh
+./greeter_client --target="a target string used to create a GRPC client channel"
+```
 
-
+The Default value for --target is "localhost:50051".
diff --git a/examples/cpp/helloworld/greeter_client.cc b/examples/cpp/helloworld/greeter_client.cc
@@ -73,11 +73,32 @@ class GreeterClient {
 
 int main(int argc, char** argv) {
   // Instantiate the client. It requires a channel, out of which the actual RPCs
-  // are created. This channel models a connection to an endpoint (in this case,
-  // localhost at port 50051). We indicate that the channel isn't authenticated
-  // (use of InsecureChannelCredentials()).
+  // are created. This channel models a connection to an endpoint specified by
+  // the argument "--target=" which is the only expected argument.
+  // We indicate that the channel isn't authenticated (use of
+  // InsecureChannelCredentials()).
+  std::string target_str;
+  std::string arg_str("--target");
+  if (argc > 1) {
+    std::string arg_val = argv[1];
+    size_t start_pos = arg_val.find(arg_str);
+    if (start_pos != std::string::npos) {
+      start_pos += arg_str.size();
+      if (arg_val[start_pos] == '=') {
+        target_str = arg_val.substr(start_pos + 1);
+      } else {
+        std::cout << "The only correct argument syntax is --target=" << std::endl;
+        return 0;
+      }
+    } else {
+      std::cout << "The only acceptable argument is --target=" << std::endl;
+      return 0;
+    }
+  } else {
+    target_str = "localhost:50051";
+  }
   GreeterClient greeter(grpc::CreateChannel(
-      "localhost:50051", grpc::InsecureChannelCredentials()));
+      target_str, grpc::InsecureChannelCredentials()));
   std::string user("world");
   std::string reply = greeter.SayHello(user);
   std::cout << "Greeter received: " << reply << std::endl;

diff --git a/examples/python/cancellation/BUILD.bazel b/examples/python/cancellation/BUILD.bazel
@@ -15,6 +15,7 @@
 # limitations under the License.
 
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 
 package(default_testonly = 1)

diff --git a/examples/python/multiprocessing/BUILD b/examples/python/multiprocessing/BUILD
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 
 proto_library(

diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
@@ -63,7 +63,7 @@ class CdsLb : public LoadBalancingPolicy {
    public:
     explicit ClusterWatcher(RefCountedPtr<CdsLb> parent)
         : parent_(std::move(parent)) {}
-    void OnClusterChanged(CdsUpdate cluster_data) override;
+    void OnClusterChanged(XdsApi::CdsUpdate cluster_data) override;
     void OnError(grpc_error* error) override;
 
    private:
@@ -111,7 +111,7 @@ class CdsLb : public LoadBalancingPolicy {
 // CdsLb::ClusterWatcher
 //
 
-void CdsLb::ClusterWatcher::OnClusterChanged(CdsUpdate cluster_data) {
+void CdsLb::ClusterWatcher::OnClusterChanged(XdsApi::CdsUpdate cluster_data) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) {
     gpr_log(GPR_INFO, "[cdslb %p] received CDS update from xds client",
             parent_.get());

diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc
@@ -172,7 +172,7 @@ class XdsLb : public LoadBalancingPolicy {
 
     RefCountedPtr<XdsLb> xds_policy_;
     PickerList pickers_;
-    RefCountedPtr<XdsDropConfig> drop_config_;
+    RefCountedPtr<XdsApi::DropConfig> drop_config_;
   };
 
   class FallbackHelper : public ChannelControlHelper {
@@ -286,7 +286,7 @@ class XdsLb : public LoadBalancingPolicy {
     ~LocalityMap() { xds_policy_.reset(DEBUG_LOCATION, "LocalityMap"); }
 
     void UpdateLocked(
-        const XdsPriorityListUpdate::LocalityMap& locality_map_update);
+        const XdsApi::PriorityListUpdate::LocalityMap& locality_map_update);
     void ResetBackoffLocked();
     void UpdateXdsPickerLocked();
     OrphanablePtr<Locality> ExtractLocalityLocked(
@@ -316,10 +316,10 @@ class XdsLb : public LoadBalancingPolicy {
     static void OnDelayedRemovalTimerLocked(void* arg, grpc_error* error);
     static void OnFailoverTimerLocked(void* arg, grpc_error* error);
 
-    const XdsPriorityListUpdate& priority_list_update() const {
+    const XdsApi::PriorityListUpdate& priority_list_update() const {
       return xds_policy_->priority_list_update_;
     }
-    const XdsPriorityListUpdate::LocalityMap* locality_map_update() const {
+    const XdsApi::PriorityListUpdate::LocalityMap* locality_map_update() const {
       return xds_policy_->priority_list_update_.Find(priority_);
     }
 
@@ -431,10 +431,10 @@ class XdsLb : public LoadBalancingPolicy {
   // The priority that is being used.
   uint32_t current_priority_ = UINT32_MAX;
   // The update for priority_list_.
-  XdsPriorityListUpdate priority_list_update_;
+  XdsApi::PriorityListUpdate priority_list_update_;
 
   // The config for dropping calls.
-  RefCountedPtr<XdsDropConfig> drop_config_;
+  RefCountedPtr<XdsApi::DropConfig> drop_config_;
 
   // The stats for client-side load reporting.
   XdsClientStats client_stats_;
@@ -594,7 +594,7 @@ class XdsLb::EndpointWatcher : public XdsClient::EndpointWatcherInterface {
 
   ~EndpointWatcher() { xds_policy_.reset(DEBUG_LOCATION, "EndpointWatcher"); }
 
-  void OnEndpointChanged(EdsUpdate update) override {
+  void OnEndpointChanged(XdsApi::EdsUpdate update) override {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_trace)) {
       gpr_log(GPR_INFO, "[xdslb %p] Received EDS update from xds client",
               xds_policy_.get());
@@ -1032,6 +1032,8 @@ void XdsLb::UpdatePrioritiesLocked() {
   for (uint32_t priority = 0; priority < priorities_.size(); ++priority) {
     LocalityMap* locality_map = priorities_[priority].get();
     const auto* locality_map_update = priority_list_update_.Find(priority);
+    // If we have more current priorities than exist in the update, stop here.
+    if (locality_map_update == nullptr) break;
     // Propagate locality_map_update.
     // TODO(juanlishen): Find a clean way to skip duplicate update for a
     // priority.
@@ -1154,7 +1156,7 @@ XdsLb::LocalityMap::LocalityMap(RefCountedPtr<XdsLb> xds_policy,
 }
 
 void XdsLb::LocalityMap::UpdateLocked(
-    const XdsPriorityListUpdate::LocalityMap& locality_map_update) {
+    const XdsApi::PriorityListUpdate::LocalityMap& locality_map_update) {
   if (xds_policy_->shutting_down_) return;
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_trace)) {
     gpr_log(GPR_INFO, "[xdslb %p] Start Updating priority %" PRIu32,