diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 09:48:24 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 09:50:24 +0200 |
| commit | 7b29da0d2943f2aa9e1c6601a538cd4ba0d100be (patch) | |
| tree | 23682623d9b33b769a86ef4717cb20ac4977502f /storage | |
| parent | ef7c93a1ffcc993b54d656c6e25a3f40366429f3 (diff) | |
Hide the system state lock
Diffstat (limited to 'storage')
3 files changed, 7 insertions, 6 deletions
diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp index b7d3554e506..26317465b5a 100644 --- a/storage/src/tests/storageserver/documentapiconvertertest.cpp +++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp @@ -2,15 +2,15 @@ #include <vespa/document/base/testdocrepo.h> #include <cppunit/extensions/HelperMacros.h> -#include <vespa/document/fieldvalue/document.h> -#include <vespa/document/datatype/documenttype.h> -#include <vespa/documentapi/documentapi.h> -#include <vespa/messagebus/emptyreply.h> #include <vespa/storage/storageserver/documentapiconverter.h> #include <vespa/storageapi/message/batch.h> #include <vespa/storageapi/message/datagram.h> #include <vespa/storageapi/message/multioperation.h> #include <vespa/storageapi/message/persistence.h> +#include <vespa/documentapi/documentapi.h> +#include <vespa/messagebus/emptyreply.h> +#include <vespa/document/datatype/documenttype.h> +#include <vespa/document/bucket/bucketidfactory.h> #include <vespa/vespalib/testkit/test_kit.h> using document::DataType; diff --git a/storage/src/vespa/storage/distributor/messageguard.h b/storage/src/vespa/storage/distributor/messageguard.h index 8d549965136..2944cc20c70 100644 --- a/storage/src/vespa/storage/distributor/messageguard.h +++ b/storage/src/vespa/storage/distributor/messageguard.h @@ -1,8 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "pendingclusterstate.h" #include <vespa/storage/common/messagesender.h> -#include <vespa/storage/distributor/pendingclusterstate.h> +#include <vespa/vespalib/util/sync.h> namespace storage { diff --git a/storage/src/vespa/storage/distributor/messagetracker.cpp b/storage/src/vespa/storage/distributor/messagetracker.cpp index aeca85e821d..0b213a85dd3 100644 --- a/storage/src/vespa/storage/distributor/messagetracker.cpp +++ b/storage/src/vespa/storage/distributor/messagetracker.cpp @@ -33,7 +33,7 @@ MessageTracker::handleReply(api::BucketReply& reply) { std::map<uint64_t, uint16_t>::iterator found = _sentMessages.find(reply.getMsgId()); if (found == _sentMessages.end()) { - LOG(warning, "Received reply %" PRIu64 " for callback which we have no recollection of", reply.getMsgId()); + LOG(warning, "Received reply %zu for callback which we have no recollection of", reply.getMsgId()); return (uint16_t)-1; } else { uint16_t node = found->second; |