Skip to content

Commit 7a9cc2d

Browse files
committed
osd/SnapMapper: Crimson - remove LINE log lines
Signed-off-by: Matan Breizman <[email protected]>
1 parent f912e90 commit 7a9cc2d

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/osd/SnapMapper.cc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ int OSDriver::get_keys(
9595
const std::set<std::string> &keys,
9696
std::map<std::string, ceph::buffer::list> *out)
9797
{
98-
CRIMSON_DEBUG("OSDriver::{}:{}", __func__, __LINE__);
98+
CRIMSON_DEBUG("OSDriver::{}", __func__);
9999
using crimson::os::FuturizedStore;
100100
return interruptor::green_get(os->omap_get_values(
101101
ch, hoid, keys
@@ -107,54 +107,53 @@ int OSDriver::get_keys(
107107
assert(e.value() > 0);
108108
return -e.value();
109109
}))); // this requires seastar::thread
110-
CRIMSON_DEBUG("OSDriver::{}:{}", __func__, __LINE__);
111110
}
112111

113112
int OSDriver::get_next(
114113
const std::string &key,
115114
std::pair<std::string, ceph::buffer::list> *next)
116115
{
117-
CRIMSON_DEBUG("OSDriver::{}:{}", __func__, __LINE__);
116+
CRIMSON_DEBUG("OSDriver::{} key {}", __func__, key);
118117
using crimson::os::FuturizedStore;
119118
return interruptor::green_get(os->omap_get_values(
120119
ch, hoid, key
121120
).safe_then_unpack([&key, next] (bool, FuturizedStore::Shard::omap_values_t&& vals) {
122-
CRIMSON_DEBUG("OSDriver::{}:{}", "get_next", __LINE__);
121+
CRIMSON_DEBUG("OSDriver::get_next key {} got omap values", key);
123122
if (auto nit = std::begin(vals); nit == std::end(vals)) {
124-
CRIMSON_DEBUG("OSDriver::{}:{}", "get_next", __LINE__);
123+
CRIMSON_DEBUG("OSDriver::get_next key {} no more values", key);
125124
return -ENOENT;
126125
} else {
127-
CRIMSON_DEBUG("OSDriver::{}:{}", "get_next", __LINE__);
126+
CRIMSON_DEBUG("OSDriver::get_next returning next: {}, ", nit->first);
128127
assert(nit->first > key);
129128
*next = *nit;
130129
return 0;
131130
}
132131
}, FuturizedStore::Shard::read_errorator::all_same_way([] {
133-
CRIMSON_DEBUG("OSDriver::{}:{}", "get_next", __LINE__);
132+
CRIMSON_DEBUG("OSDriver::get_next saw error returning EINVAL");
134133
return -EINVAL;
135134
}))); // this requires seastar::thread
136-
CRIMSON_DEBUG("OSDriver::{}:{}", __func__, __LINE__);
137135
}
138136

139137
int OSDriver::get_next_or_current(
140138
const std::string &key,
141139
std::pair<std::string, ceph::buffer::list> *next_or_current)
142140
{
143-
CRIMSON_DEBUG("OSDriver::{}:{}", __func__, __LINE__);
141+
CRIMSON_DEBUG("OSDriver::{} key {}", __func__, key);
144142
using crimson::os::FuturizedStore;
145143
// let's try to get current first
146144
return interruptor::green_get(os->omap_get_values(
147145
ch, hoid, FuturizedStore::Shard::omap_keys_t{key}
148146
).safe_then([&key, next_or_current] (FuturizedStore::Shard::omap_values_t&& vals) {
147+
CRIMSON_DEBUG("OSDriver::get_next_or_current returning {}", key);
149148
assert(vals.size() == 1);
150149
*next_or_current = std::make_pair(key, std::move(vals[0]));
151150
return 0;
152151
}, FuturizedStore::Shard::read_errorator::all_same_way(
153152
[next_or_current, &key, this] {
153+
CRIMSON_DEBUG("OSDriver::get_next_or_current no current, try next {}", key);
154154
// no current, try next
155155
return get_next(key, next_or_current);
156156
}))); // this requires seastar::thread
157-
CRIMSON_DEBUG("OSDriver::{}:{}", __func__, __LINE__);
158157
}
159158
#else
160159
int OSDriver::get_keys(

0 commit comments

Comments
 (0)