Removed unnecessary optimization and warning message (#369)

cloudendpoints · Mar 29, 2018 · d07f3cb · d07f3cb
1 parent 51d5bf6
commit d07f3cb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -26,7 +26,7 @@
 #
 # A Bazel (http://bazel.io) workspace for the Google Cloud Endpoints runtime.
 
-ESP_TOOL = "7c1cac2aa0613f40200acb64342b23823e5a3621"
+ESP_TOOL = "4fba523678a197983b572e1219f3e4fe968b1889"
 
 git_repository(
     name = "nginx",

diff --git a/src/api_manager/fetch_metadata.cc b/src/api_manager/fetch_metadata.cc
@@ -83,16 +83,11 @@ void GlobalFetchGceMetadata(std::shared_ptr<context::GlobalContext> context,
       env->LogDebug("Metadata fetch previously failed. Skipping with error.");
       continuation(Status(Code::INTERNAL, kFailedMetadataFetch));
       return;
-    case GceMetadata::FETCHING:
-      env->LogDebug("Another request fetching metadata. Duplicate fetch.");
-      continuation(Status(Code::UNAVAILABLE, kFailedMetadataFetch));
-      return;
     case GceMetadata::NONE:
     default:
       env->LogDebug("Fetching metadata.");
   }
 
-  context->gce_metadata()->set_state(GceMetadata::FETCHING);
   FetchMetadata(
       context.get(), kComputeMetadata,
       [context, continuation](Status status, std::map<std::string, std::string>,

diff --git a/src/api_manager/gce_metadata.h b/src/api_manager/gce_metadata.h
@@ -26,8 +26,6 @@ class GceMetadata {
  public:
   enum FetchState {
     NONE = 0,
-    // Fetching,
-    FETCHING,
     // Fetch failed
     FAILED,
     // Data is go

diff --git a/src/api_manager/service_control/aggregated.cc b/src/api_manager/service_control/aggregated.cc
@@ -267,7 +267,7 @@ Status Aggregated::Report(const ReportRequestInfo& info) {
           if (service_control_proto_.service_config_id() !=
               response->service_config_id()) {
             if (mismatched_report_config_id_ != response->service_config_id()) {
-              env_->LogWarning(
+              env_->LogDebug(
                   "Received non-matching report response service config ID: '" +
                   response->service_config_id() + "', requested: '" +
                   service_control_proto_.service_config_id() + "'");