grpc 1.28.0.pre2 → 1.28.0

data/src/core/ext/filters/client_channel/xds/xds_client.h

@@ -21,13 +21,14 @@
 
 #include <set>
 
+#include "absl/types/optional.h"
+
 #include "src/core/ext/filters/client_channel/service_config.h"
 #include "src/core/ext/filters/client_channel/xds/xds_api.h"
 #include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h"
 #include "src/core/ext/filters/client_channel/xds/xds_client_stats.h"
 #include "src/core/lib/gprpp/map.h"
 #include "src/core/lib/gprpp/memory.h"
-#include "src/core/lib/gprpp/optional.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -86,20 +87,26 @@ class XdsClient : public InternallyRefCounted<XdsClient> {
   // keep a raw pointer to the watcher, which may be used only for
   // cancellation.  (Because the caller does not own the watcher, the
   // pointer must not be used for any other purpose.)
+  // If the caller is going to start a new watch after cancelling the
+  // old one, it should set delay_unsubscription to true.
   void WatchClusterData(StringView cluster_name,
                         std::unique_ptr<ClusterWatcherInterface> watcher);
   void CancelClusterDataWatch(StringView cluster_name,
-                              ClusterWatcherInterface* watcher);
+                              ClusterWatcherInterface* watcher,
+                              bool delay_unsubscription = false);
 
   // Start and cancel endpoint data watch for a cluster.
   // The XdsClient takes ownership of the watcher, but the caller may
   // keep a raw pointer to the watcher, which may be used only for
   // cancellation.  (Because the caller does not own the watcher, the
   // pointer must not be used for any other purpose.)
+  // If the caller is going to start a new watch after cancelling the
+  // old one, it should set delay_unsubscription to true.
   void WatchEndpointData(StringView eds_service_name,
                          std::unique_ptr<EndpointWatcherInterface> watcher);
   void CancelEndpointDataWatch(StringView eds_service_name,
-                               EndpointWatcherInterface* watcher);
+                               EndpointWatcherInterface* watcher,
+                               bool delay_unsubscription = false);
 
   // Adds and removes drop stats for cluster_name and eds_service_name.
   RefCountedPtr<XdsClusterDropStats> AddClusterDropStats(
@@ -167,7 +174,8 @@ class XdsClient : public InternallyRefCounted<XdsClient> {
     void CancelConnectivityWatchLocked();
 
     void Subscribe(const std::string& type_url, const std::string& name);
-    void Unsubscribe(const std::string& type_url, const std::string& name);
+    void Unsubscribe(const std::string& type_url, const std::string& name,
+                     bool delay_unsubscription);
 
    private:
     class StateWatcher;
@@ -189,7 +197,7 @@ class XdsClient : public InternallyRefCounted<XdsClient> {
     std::map<ClusterWatcherInterface*, std::unique_ptr<ClusterWatcherInterface>>
         watchers;
     // The latest data seen from CDS.
-    Optional<XdsApi::CdsUpdate> update;
+    absl::optional<XdsApi::CdsUpdate> update;
   };
 
   struct EndpointState {
@@ -197,12 +205,18 @@ class XdsClient : public InternallyRefCounted<XdsClient> {
              std::unique_ptr<EndpointWatcherInterface>>
         watchers;
     // The latest data seen from EDS.
-    XdsApi::EdsUpdate update;
+    absl::optional<XdsApi::EdsUpdate> update;
   };
 
   struct LoadReportState {
+    struct LocalityState {
+      std::set<XdsClusterLocalityStats*> locality_stats;
+      std::vector<XdsClusterLocalityStats::Snapshot> deleted_locality_stats;
+    };
+
     std::set<XdsClusterDropStats*> drop_stats;
-    std::map<RefCountedPtr<XdsLocalityName>, std::set<XdsClusterLocalityStats*>,
+    XdsClusterDropStats::DroppedRequestsMap deleted_drop_stats;
+    std::map<RefCountedPtr<XdsLocalityName>, LocalityState,
              XdsLocalityName::Less>
         locality_stats;
     grpc_millis last_report_time = ExecCtx::Get()->Now();
@@ -215,7 +229,8 @@ class XdsClient : public InternallyRefCounted<XdsClient> {
       const std::string& cluster_name,
       RefCountedPtr<ServiceConfig>* service_config) const;
 
-  XdsApi::ClusterLoadReportMap BuildLoadReportSnapshot();
+  XdsApi::ClusterLoadReportMap BuildLoadReportSnapshot(
+      const std::set<std::string>& clusters);
 
   // Channel arg vtable functions.
   static void* ChannelArgCopy(void* p);
@@ -239,11 +254,12 @@ class XdsClient : public InternallyRefCounted<XdsClient> {
   // The channel for communicating with the xds server.
   OrphanablePtr<ChannelState> chand_;
 
-  std::string route_config_name_;
-  std::string cluster_name_;
-  // All the received clusters are cached, no matter they are watched or not.
+  absl::optional<XdsApi::LdsUpdate> lds_result_;
+  absl::optional<XdsApi::RdsUpdate> rds_result_;
+
+  // One entry for each watched CDS resource.
   std::map<std::string /*cluster_name*/, ClusterState> cluster_map_;
-  // Only the watched EDS service names are stored.
+  // One entry for each watched EDS resource.
   std::map<std::string /*eds_service_name*/, EndpointState> endpoint_map_;
   std::map<
       std::pair<std::string /*cluster_name*/, std::string /*eds_service_name*/>,

data/src/core/lib/gprpp/sync.h

@@ -117,6 +117,15 @@ class CondVar {
     }
   }
 
+  // Returns true iff we timed-out
+  template <typename Predicate>
+  bool WaitUntil(Mutex* mu, Predicate pred, const gpr_timespec& deadline) {
+    while (!pred()) {
+      if (Wait(mu, deadline)) return true;
+    }
+    return false;
+  }
+
  private:
   gpr_cv cv_;
 };

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.28.0.pre2'
+  VERSION = '1.28.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.28.0.pre2
+  version: 1.28.0
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -289,6 +289,8 @@ files:
 - src/core/ext/filters/client_channel/http_proxy.h
 - src/core/ext/filters/client_channel/lb_policy.cc
 - src/core/ext/filters/client_channel/lb_policy.h
+- src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc
+- src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h
 - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc
 - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h
 - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
@@ -1902,50 +1904,50 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby
 test_files:
-- src/ruby/spec/call_credentials_spec.rb
-- src/ruby/spec/support/services.rb
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/generic/service_spec.rb
-- src/ruby/spec/generic/active_call_spec.rb
+- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/client_auth_spec.rb
+- src/ruby/spec/generic/client_stub_spec.rb
 - src/ruby/spec/generic/rpc_desc_spec.rb
-- src/ruby/spec/generic/rpc_server_pool_spec.rb
-- src/ruby/spec/generic/server_interceptors_spec.rb
 - src/ruby/spec/generic/client_interceptors_spec.rb
 - src/ruby/spec/generic/interceptor_registry_spec.rb
+- src/ruby/spec/generic/service_spec.rb
+- src/ruby/spec/generic/rpc_server_pool_spec.rb
+- src/ruby/spec/generic/active_call_spec.rb
 - src/ruby/spec/generic/rpc_server_spec.rb
-- src/ruby/spec/generic/client_stub_spec.rb
-- src/ruby/spec/server_credentials_spec.rb
-- src/ruby/spec/time_consts_spec.rb
-- src/ruby/spec/client_server_spec.rb
-- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/generic/server_interceptors_spec.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/support/services.rb
 - src/ruby/spec/spec_helper.rb
-- src/ruby/spec/testdata/README
-- src/ruby/spec/testdata/ca.pem
-- src/ruby/spec/testdata/client.pem
-- src/ruby/spec/testdata/server1.pem
-- src/ruby/spec/testdata/server1.key
-- src/ruby/spec/testdata/client.key
-- src/ruby/spec/call_spec.rb
-- src/ruby/spec/server_spec.rb
+- src/ruby/spec/server_credentials_spec.rb
 - src/ruby/spec/channel_spec.rb
-- src/ruby/spec/errors_spec.rb
+- src/ruby/spec/call_spec.rb
+- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/channel_credentials_spec.rb
+- src/ruby/spec/client_server_spec.rb
 - src/ruby/spec/compression_options_spec.rb
-- src/ruby/spec/google_rpc_status_utils_spec.rb
 - src/ruby/spec/pb/duplicate/codegen_spec.rb
-- src/ruby/spec/pb/health/checker_spec.rb
-- src/ruby/spec/pb/codegen/package_option_spec.rb
 - src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
-- src/ruby/spec/channel_credentials_spec.rb
-- src/ruby/spec/client_auth_spec.rb
+- src/ruby/spec/pb/codegen/package_option_spec.rb
+- src/ruby/spec/pb/health/checker_spec.rb
+- src/ruby/spec/testdata/client.key
+- src/ruby/spec/testdata/server1.pem
+- src/ruby/spec/testdata/README
+- src/ruby/spec/testdata/client.pem
+- src/ruby/spec/testdata/ca.pem
+- src/ruby/spec/testdata/server1.key
+- src/ruby/spec/errors_spec.rb
 - src/ruby/spec/error_sanity_spec.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
+- src/ruby/spec/server_spec.rb
+- src/ruby/spec/call_credentials_spec.rb