diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-12 14:50:05 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-12 22:00:32 +0000 |
commit | 4a4d8938b3e7e71a6926cbf8ddbecf22eabe955e (patch) | |
tree | f52deb3f7da9c3a21bdb425cdd8156ef52b7104f | |
parent | 6fb9da718607e30498e7cd1d146df89ddbfdb448 (diff) |
Use the feed reject helper in persistenceengine too.
-rw-r--r-- | document/src/tests/feed_reject_helper_test.cpp | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/document/src/tests/feed_reject_helper_test.cpp b/document/src/tests/feed_reject_helper_test.cpp index 8dac86f99eb..477ae2520b3 100644 --- a/document/src/tests/feed_reject_helper_test.cpp +++ b/document/src/tests/feed_reject_helper_test.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/fieldvalue/boolfieldvalue.h> #include <vespa/document/fieldvalue/bytefieldvalue.h> diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp index d938a02e5e9..7a2d9403c29 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp @@ -7,6 +7,7 @@ #include <vespa/document/fieldvalue/document.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/update/documentupdate.h> +#include <vespa/document/util/feed_reject_helper.h> #include <vespa/document/base/exceptions.h> #include <thread> @@ -359,7 +360,7 @@ PersistenceEngine::updateAsync(const Bucket& b, Timestamp t, DocumentUpdate::SP { if (!_writeFilter.acceptWriteOperation()) { IResourceWriteFilter::State state = _writeFilter.getAcceptState(); - if (!state.acceptWriteOperation()) { + if (!state.acceptWriteOperation() && document::FeedRejectHelper::mustReject(*upd)) { return onComplete->onComplete(std::make_unique<UpdateResult>(Result::ErrorType::RESOURCE_EXHAUSTED, make_string("Update operation rejected for document '%s': '%s'", upd->getId().toString().c_str(), state.message().c_str()))); |