Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

luminous: rbd: abort in listing mapped nbd devices when running in a container #19051

Merged
merged 2 commits into from
Jan 31, 2018
Merged

luminous: rbd: abort in listing mapped nbd devices when running in a container #19051

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
210b826
rbd-nbd: not abort in listing mapped nbd devices
dragonylffly Nov 1, 2017
2d9aafe
rbd-nbd: fix unused nbd device search bug in container
dragonylffly Nov 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/tools/rbd_nbd/rbd-nbd.cc
View file
Open in desktop
Expand Up @@ -610,12 +610,27 @@ static int do_map(int argc, const char *argv[], Config *cfg)
if (cfg->devpath.empty()) {
char dev[64];
bool try_load_module = true;
const char *path = "/sys/module/nbd/parameters/nbds_max";
int nbds_max = -1;
if (access(path, F_OK) == 0) {
std::ifstream ifs;
ifs.open(path, std::ifstream::in);
if (ifs.is_open()) {
ifs >> nbds_max;
ifs.close();
}
}

while (true) {
snprintf(dev, sizeof(dev), "/dev/nbd%d", index);

nbd = open_device(dev, cfg, try_load_module);
try_load_module = false;
if (nbd < 0) {
if (nbd == -EPERM && nbds_max != -1 && index < (nbds_max-1)) {
++index;
continue;
}
r = nbd;
cerr << "rbd-nbd: failed to find unused device" << std::endl;
goto close_fd;
Expand Down Expand Up @@ -838,7 +853,8 @@ static int get_mapped_info(int pid, Config *cfg)
std::vector<const char*> args;

ifs.open(path.c_str(), std::ifstream::in);
assert (ifs.is_open());
if (!ifs.is_open())
return -1;
ifs >> cmdline;

for (unsigned i = 0; i < cmdline.size(); i++) {
Expand Down