Automated Code Change

PiperOrigin-RevId: 785200076

Author: tensorflower-gardener

tensorflow_serving/core/load_servables_fast.cc

@@ -44,10 +44,10 @@ std::function<void(const uint32)> SetManagerNumLoadThreadsNotifier(
   return manager->set_num_load_threads_observer_->Notifier();
 }
 
-Status ConnectSourcesWithFastInitialLoad(
+absl::Status ConnectSourcesWithFastInitialLoad(
     AspiredVersionsManager* manager,
     std::vector<Source<std::unique_ptr<Loader>>*> sources,
-    const std::function<Status()>& wait_until_loaded_fn,
+    const std::function<absl::Status()>& wait_until_loaded_fn,
     const uint32 num_threads) {
   const uint32 prev_num_load_threads = GetManagerNumLoadThreads(manager);
   std::function<void(const uint32)> set_manager_num_load_threads =
@@ -56,14 +56,14 @@ Status ConnectSourcesWithFastInitialLoad(
   for (Source<std::unique_ptr<Loader>>* source : sources) {
     ConnectSourceToTarget(source, manager);
   }
-  const Status status = wait_until_loaded_fn();
+  const absl::Status status = wait_until_loaded_fn();
   set_manager_num_load_threads(prev_num_load_threads);
   return status;
 }
 
 }  // namespace internal
 
-Status ConnectSourceWithFastInitialLoad(
+absl::Status ConnectSourceWithFastInitialLoad(
     AspiredVersionsManager* manager, Source<std::unique_ptr<Loader>>* source,
     ServableStateMonitor* servable_state_monitor,
     const std::vector<ServableRequest>& initial_servables,
@@ -73,7 +73,7 @@ Status ConnectSourceWithFastInitialLoad(
                                            initial_servables, num_threads);
 }
 
-Status ConnectSourcesWithFastInitialLoad(
+absl::Status ConnectSourcesWithFastInitialLoad(
     AspiredVersionsManager* manager,
     std::vector<Source<std::unique_ptr<Loader>>*> sources,
     ServableStateMonitor* servable_state_monitor,
@@ -116,7 +116,7 @@ Status ConnectSourcesWithFastInitialLoad(
           strings::StrAppend(&message, "}");
           return errors::Unknown(message);
         }
-        return OkStatus();
+        return absl::OkStatus();
       },
       num_threads);
 }

tensorflow_serving/core/loader_harness.cc

@@ -51,7 +51,7 @@ LoaderHarness::State LoaderHarness::state() const {
   return state_;
 }
 
-Status LoaderHarness::LoadRequested() {
+absl::Status LoaderHarness::LoadRequested() {
   mutex_lock l(mu_);
 
   if (state_ != State::kNew) {
@@ -60,25 +60,25 @@ Status LoaderHarness::LoadRequested() {
   state_ = State::kLoadRequested;
   VLOG(1) << "Load requested for servable version " << id_;
 
-  return OkStatus();
+  return absl::OkStatus();
 }
 
-Status LoaderHarness::LoadApproved() {
+absl::Status LoaderHarness::LoadApproved() {
   mutex_lock l(mu_);
   TF_RETURN_IF_ERROR(
       TransitionState(State::kLoadRequested, State::kLoadApproved));
   LOG(INFO) << "Approving load for servable version " << id_;
-  return OkStatus();
+  return absl::OkStatus();
 }
 
-Status LoaderHarness::Load() {
+absl::Status LoaderHarness::Load() {
   {
     mutex_lock l(mu_);
     TF_RETURN_IF_ERROR(TransitionState(State::kLoadApproved, State::kLoading));
     LOG(INFO) << "Loading servable version " << id_;
   }
 
-  const Status status = Retry(
+  const absl::Status status = Retry(
       strings::StrCat("Loading servable: ", id_.DebugString()),
       options_.max_num_load_retries, options_.load_retry_interval_micros,
       [&]() { return loader_->LoadWithMetadata({id_}); },
@@ -111,17 +111,17 @@ Status LoaderHarness::Load() {
   return status;
 }
 
-Status LoaderHarness::UnloadRequested() {
+absl::Status LoaderHarness::UnloadRequested() {
   mutex_lock l(mu_);
   if (state_ != State::kReady) {
     return errors::FailedPrecondition(
         "Servable not loaded, or unload already requested/ongoing");
   }
   state_ = State::kUnloadRequested;
-  return OkStatus();
+  return absl::OkStatus();
 }
 
-Status LoaderHarness::UnloadInternal(State from_state) {
+absl::Status LoaderHarness::UnloadInternal(State from_state) {
   {
     mutex_lock l(mu_);
     TF_RETURN_IF_ERROR(TransitionState(from_state, State::kUnloading));
@@ -135,10 +135,10 @@ Status LoaderHarness::UnloadInternal(State from_state) {
     TF_RETURN_IF_ERROR(TransitionState(State::kUnloading, State::kDisabled));
     LOG(INFO) << "Done unloading servable version " << id_;
   }
-  return OkStatus();
+  return absl::OkStatus();
 }
 
-Status LoaderHarness::UnloadDueToCancelledLoad() {
+absl::Status LoaderHarness::UnloadDueToCancelledLoad() {
   return UnloadInternal(State::kLoading);
 }
 
@@ -153,24 +153,26 @@ bool LoaderHarness::should_retry(absl::Status status) {
   return should_retry_(status);
 }
 
-Status LoaderHarness::Unload() { return UnloadInternal(State::kQuiesced); }
+absl::Status LoaderHarness::Unload() {
+  return UnloadInternal(State::kQuiesced);
+}
 
-Status LoaderHarness::StartQuiescing() {
+absl::Status LoaderHarness::StartQuiescing() {
   mutex_lock l(mu_);
   TF_RETURN_IF_ERROR(
       TransitionState(State::kUnloadRequested, State::kQuiescing));
   LOG(INFO) << "Quiescing servable version " << id_;
-  return OkStatus();
+  return absl::OkStatus();
 }
 
-Status LoaderHarness::DoneQuiescing() {
+absl::Status LoaderHarness::DoneQuiescing() {
   mutex_lock l(mu_);
   TF_RETURN_IF_ERROR(TransitionState(State::kQuiescing, State::kQuiesced));
   LOG(INFO) << "Done quiescing servable version " << id_;
-  return OkStatus();
+  return absl::OkStatus();
 }
 
-void LoaderHarness::ErrorInternal(const Status& status) {
+void LoaderHarness::ErrorInternal(const absl::Status& status) {
   state_ = State::kError;
   status_ = status;
   if (options_.error_callback) {
@@ -180,14 +182,14 @@ void LoaderHarness::ErrorInternal(const Status& status) {
             << status_;
 }
 
-void LoaderHarness::Error(const Status& status) {
+void LoaderHarness::Error(const absl::Status& status) {
   mutex_lock l(mu_);
   ErrorInternal(status);
 }
 
-Status LoaderHarness::TransitionState(const State from, const State to) {
+absl::Status LoaderHarness::TransitionState(const State from, const State to) {
   if (state_ != from) {
-    const Status error = errors::Internal(
+    const absl::Status error = errors::Internal(
         "Illegal request to transition from state ", StateDebugString(state_),
         " to ", StateDebugString(to));
 #ifndef NDEBUG
@@ -198,10 +200,10 @@ Status LoaderHarness::TransitionState(const State from, const State to) {
     return error;
   }
   state_ = to;
-  return OkStatus();
+  return absl::OkStatus();
 }
 
-Status LoaderHarness::status() const {
+absl::Status LoaderHarness::status() const {
   mutex_lock l(mu_);
   return status_;
 }