Skip to content

Commit a3cfc96

Browse files
Automated Code Change
PiperOrigin-RevId: 684806051
1 parent b13d669 commit a3cfc96

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

tensorflow_serving/sources/storage_path/file_system_storage_path_source.cc

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,14 @@ bool AspireSpecificVersions(
247247
}
248248

249249
// Like PollFileSystemForConfig(), but for a single servable.
250-
Status PollFileSystemForServable(
250+
absl::Status PollFileSystemForServable(
251251
const FileSystemStoragePathSourceConfig::ServableToMonitor& servable,
252252
std::vector<ServableData<StoragePath>>* versions) {
253253
// First, determine whether the base path exists. This check guarantees that
254254
// we don't emit an empty aspired-versions list for a non-existent (or
255255
// transiently unavailable) base-path. (On some platforms, GetChildren()
256256
// returns an empty list instead of erring if the base path isn't found.)
257-
Status status = Env::Default()->FileExists(servable.base_path());
257+
absl::Status status = Env::Default()->FileExists(servable.base_path());
258258
if (!status.ok()) {
259259
return errors::InvalidArgument(
260260
"Could not find base path ", servable.base_path(), " for servable ",
@@ -317,13 +317,13 @@ Status PollFileSystemForServable(
317317
"(eg. '/1/')?";
318318
}
319319

320-
return Status();
320+
return absl::Status();
321321
}
322322

323323
// Polls the file system, and populates 'versions_by_servable_name' with the
324324
// aspired-versions data FileSystemStoragePathSource should emit based on what
325325
// was found, indexed by servable name.
326-
Status PollFileSystemForConfig(
326+
absl::Status PollFileSystemForConfig(
327327
const FileSystemStoragePathSourceConfig& config,
328328
std::map<string, std::vector<ServableData<StoragePath>>>*
329329
versions_by_servable_name) {
@@ -334,12 +334,13 @@ Status PollFileSystemForConfig(
334334
versions_by_servable_name->insert(
335335
{servable.servable_name(), std::move(versions)});
336336
}
337-
return Status();
337+
return absl::Status();
338338
}
339339

340340
// Determines if, for any servables in 'config', the file system doesn't
341341
// currently contain at least one version under its base path.
342-
Status FailIfZeroVersions(const FileSystemStoragePathSourceConfig& config) {
342+
absl::Status FailIfZeroVersions(
343+
const FileSystemStoragePathSourceConfig& config) {
343344
std::map<string, std::vector<ServableData<StoragePath>>>
344345
versions_by_servable_name;
345346
TF_RETURN_IF_ERROR(
@@ -361,19 +362,19 @@ Status FailIfZeroVersions(const FileSystemStoragePathSourceConfig& config) {
361362
" at: ", servable_name_to_base_path_map[servable]);
362363
}
363364
}
364-
return Status();
365+
return absl::Status();
365366
}
366367

367368
} // namespace
368369

369-
Status FileSystemStoragePathSource::Create(
370+
absl::Status FileSystemStoragePathSource::Create(
370371
const FileSystemStoragePathSourceConfig& config,
371372
std::unique_ptr<FileSystemStoragePathSource>* result) {
372373
result->reset(new FileSystemStoragePathSource());
373374
return (*result)->UpdateConfig(config);
374375
}
375376

376-
Status FileSystemStoragePathSource::UpdateConfig(
377+
absl::Status FileSystemStoragePathSource::UpdateConfig(
377378
const FileSystemStoragePathSourceConfig& config) {
378379
mutex_lock l(mu_);
379380

@@ -394,7 +395,7 @@ Status FileSystemStoragePathSource::UpdateConfig(
394395
}
395396
config_ = config;
396397

397-
return Status();
398+
return absl::Status();
398399
}
399400

400401
void FileSystemStoragePathSource::SetAspiredVersionsCallback(
@@ -410,7 +411,7 @@ void FileSystemStoragePathSource::SetAspiredVersionsCallback(
410411
aspired_versions_callback_ = callback;
411412

412413
const auto thread_fn = [this](void) {
413-
Status status = this->PollFileSystemAndInvokeCallback();
414+
absl::Status status = this->PollFileSystemAndInvokeCallback();
414415
if (!status.ok()) {
415416
LOG(ERROR) << "FileSystemStoragePathSource encountered a "
416417
"filesystem access error: "
@@ -437,7 +438,7 @@ void FileSystemStoragePathSource::SetAspiredVersionsCallback(
437438
}
438439
}
439440

440-
Status FileSystemStoragePathSource::PollFileSystemAndInvokeCallback() {
441+
absl::Status FileSystemStoragePathSource::PollFileSystemAndInvokeCallback() {
441442
mutex_lock l(mu_);
442443
std::map<string, std::vector<ServableData<StoragePath>>>
443444
versions_by_servable_name;
@@ -461,16 +462,16 @@ Status FileSystemStoragePathSource::PollFileSystemAndInvokeCallback() {
461462
}
462463
CallAspiredVersionsCallback(servable, versions);
463464
}
464-
return Status();
465+
return absl::Status();
465466
}
466467

467-
Status FileSystemStoragePathSource::UnaspireServables(
468+
absl::Status FileSystemStoragePathSource::UnaspireServables(
468469
const std::set<string>& servable_names) {
469470
for (const string& servable_name : servable_names) {
470471
CallAspiredVersionsCallback(servable_name,
471472
std::vector<ServableData<StoragePath>>{});
472473
}
473-
return Status();
474+
return absl::Status();
474475
}
475476

476477
} // namespace serving

tensorflow_serving/sources/storage_path/file_system_storage_path_source_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class FileSystemStoragePathSourceTestAccess {
5353
explicit FileSystemStoragePathSourceTestAccess(Source<StoragePath>* source)
5454
: source_(static_cast<FileSystemStoragePathSource*>(source)) {}
5555

56-
Status PollFileSystemAndInvokeCallback() {
56+
absl::Status PollFileSystemAndInvokeCallback() {
5757
return source_->PollFileSystemAndInvokeCallback();
5858
}
5959

tensorflow_serving/sources/storage_path/static_storage_path_source.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ limitations under the License.
2525
namespace tensorflow {
2626
namespace serving {
2727

28-
Status StaticStoragePathSource::Create(
28+
absl::Status StaticStoragePathSource::Create(
2929
const StaticStoragePathSourceConfig& config,
3030
std::unique_ptr<StaticStoragePathSource>* result) {
3131
auto raw_result = new StaticStoragePathSource;
3232
raw_result->config_ = config;
3333
result->reset(raw_result);
34-
return Status();
34+
return absl::Status();
3535
}
3636

3737
void StaticStoragePathSource::SetAspiredVersionsCallback(

0 commit comments

Comments
 (0)