mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-22 04:25:18 +00:00
storage: Remove the sheepdog storage driver backend source code
Remove the unused source code for the sheepdog storage backend. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Claudio Fontana <cfontana@suse.de> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa
parent
d4f7850d5b
commit
3e0b7167a0
@ -230,7 +230,6 @@ src/storage/storage_backend_logical.c
|
|||||||
src/storage/storage_backend_mpath.c
|
src/storage/storage_backend_mpath.c
|
||||||
src/storage/storage_backend_rbd.c
|
src/storage/storage_backend_rbd.c
|
||||||
src/storage/storage_backend_scsi.c
|
src/storage/storage_backend_scsi.c
|
||||||
src/storage/storage_backend_sheepdog.c
|
|
||||||
src/storage/storage_backend_vstorage.c
|
src/storage/storage_backend_vstorage.c
|
||||||
src/storage/storage_backend_zfs.c
|
src/storage/storage_backend_zfs.c
|
||||||
src/storage/storage_driver.c
|
src/storage/storage_driver.c
|
||||||
|
|||||||
@ -1,376 +0,0 @@
|
|||||||
/*
|
|
||||||
* storage_backend_sheepdog.c: storage backend for Sheepdog handling
|
|
||||||
*
|
|
||||||
* Copyright (C) 2013-2014 Red Hat, Inc.
|
|
||||||
* Copyright (C) 2012 Wido den Hollander
|
|
||||||
* Copyright (C) 2012 Frank Spijkerman
|
|
||||||
* Copyright (C) 2012 Sebastian Wiedenroth
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library. If not, see
|
|
||||||
* <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
#include "virerror.h"
|
|
||||||
#include "storage_backend_sheepdog.h"
|
|
||||||
#define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW
|
|
||||||
#include "storage_backend_sheepdog_priv.h"
|
|
||||||
#include "storage_conf.h"
|
|
||||||
#include "vircommand.h"
|
|
||||||
#include "viralloc.h"
|
|
||||||
#include "virstring.h"
|
|
||||||
#include "storage_util.h"
|
|
||||||
|
|
||||||
#define VIR_FROM_THIS VIR_FROM_STORAGE
|
|
||||||
|
|
||||||
static int virStorageBackendSheepdogRefreshVol(virStoragePoolObj *pool,
|
|
||||||
virStorageVolDef *vol);
|
|
||||||
|
|
||||||
void virStorageBackendSheepdogAddHostArg(virCommand *cmd,
|
|
||||||
virStoragePoolObj *pool);
|
|
||||||
|
|
||||||
int
|
|
||||||
virStorageBackendSheepdogParseNodeInfo(virStoragePoolDef *pool,
|
|
||||||
char *output)
|
|
||||||
{
|
|
||||||
/* fields:
|
|
||||||
* node id/total, size, used, use%, [total vdi size]
|
|
||||||
*
|
|
||||||
* example output:
|
|
||||||
* 0 15245667872 117571104 0%
|
|
||||||
* Total 15245667872 117571104 0% 20972341
|
|
||||||
*/
|
|
||||||
|
|
||||||
const char *p, *next;
|
|
||||||
|
|
||||||
pool->allocation = pool->capacity = pool->available = 0;
|
|
||||||
|
|
||||||
p = output;
|
|
||||||
do {
|
|
||||||
char *end;
|
|
||||||
|
|
||||||
if ((next = strchr(p, '\n')))
|
|
||||||
++next;
|
|
||||||
else
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (!STRPREFIX(p, "Total "))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
p = p + 6;
|
|
||||||
|
|
||||||
if (virStrToLong_ull(p, &end, 10, &pool->capacity) < 0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if ((p = end + 1) > next)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (virStrToLong_ull(p, &end, 10, &pool->allocation) < 0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
pool->available = pool->capacity - pool->allocation;
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
} while ((p = next));
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
virStorageBackendSheepdogAddHostArg(virCommand *cmd,
|
|
||||||
virStoragePoolObj *pool)
|
|
||||||
{
|
|
||||||
virStoragePoolDef *def = virStoragePoolObjGetDef(pool);
|
|
||||||
const char *address = "localhost";
|
|
||||||
int port = 7000;
|
|
||||||
if (def->source.nhost > 0) {
|
|
||||||
if (def->source.hosts[0].name != NULL)
|
|
||||||
address = def->source.hosts[0].name;
|
|
||||||
if (def->source.hosts[0].port)
|
|
||||||
port = def->source.hosts[0].port;
|
|
||||||
}
|
|
||||||
virCommandAddArg(cmd, "-a");
|
|
||||||
virCommandAddArgFormat(cmd, "%s", address);
|
|
||||||
virCommandAddArg(cmd, "-p");
|
|
||||||
virCommandAddArgFormat(cmd, "%d", port);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
virStorageBackendSheepdogAddVolume(virStoragePoolObj *pool, const char *diskInfo)
|
|
||||||
{
|
|
||||||
g_autoptr(virStorageVolDef) vol = NULL;
|
|
||||||
|
|
||||||
if (diskInfo == NULL) {
|
|
||||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
||||||
_("Missing disk info when adding volume"));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
vol = g_new0(virStorageVolDef, 1);
|
|
||||||
|
|
||||||
vol->name = g_strdup(diskInfo);
|
|
||||||
|
|
||||||
vol->type = VIR_STORAGE_VOL_NETWORK;
|
|
||||||
|
|
||||||
if (virStorageBackendSheepdogRefreshVol(pool, vol) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (virStoragePoolObjAddVol(pool, vol) < 0)
|
|
||||||
return -1;
|
|
||||||
vol = NULL;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
virStorageBackendSheepdogRefreshAllVol(virStoragePoolObj *pool)
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
g_autofree char *output = NULL;
|
|
||||||
g_auto(GStrv) lines = NULL;
|
|
||||||
g_autoptr(virCommand) cmd = NULL;
|
|
||||||
|
|
||||||
cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "list", "-r", NULL);
|
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
|
||||||
virCommandSetOutputBuffer(cmd, &output);
|
|
||||||
if (virCommandRun(cmd, NULL) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
lines = g_strsplit(output, "\n", 0);
|
|
||||||
if (lines == NULL)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
for (i = 0; lines[i]; i++) {
|
|
||||||
g_auto(GStrv) cells = NULL;
|
|
||||||
|
|
||||||
cells = g_strsplit(lines[i], " ", 0);
|
|
||||||
|
|
||||||
if (cells != NULL && cells[0] && cells[1]) {
|
|
||||||
if (virStorageBackendSheepdogAddVolume(pool, cells[1]) < 0)
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virStorageBackendSheepdogRefreshPool(virStoragePoolObj *pool)
|
|
||||||
{
|
|
||||||
g_autofree char *output = NULL;
|
|
||||||
g_autoptr(virCommand) cmd = NULL;
|
|
||||||
|
|
||||||
cmd = virCommandNewArgList(SHEEPDOGCLI, "node", "info", "-r", NULL);
|
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
|
||||||
virCommandSetOutputBuffer(cmd, &output);
|
|
||||||
if (virCommandRun(cmd, NULL) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (virStorageBackendSheepdogParseNodeInfo(virStoragePoolObjGetDef(pool),
|
|
||||||
output) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return virStorageBackendSheepdogRefreshAllVol(pool);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virStorageBackendSheepdogDeleteVol(virStoragePoolObj *pool,
|
|
||||||
virStorageVolDef *vol,
|
|
||||||
unsigned int flags)
|
|
||||||
{
|
|
||||||
g_autoptr(virCommand) cmd = NULL;
|
|
||||||
|
|
||||||
virCheckFlags(0, -1);
|
|
||||||
|
|
||||||
cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "delete", vol->name, NULL);
|
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
|
||||||
return virCommandRun(cmd, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virStorageBackendSheepdogCreateVol(virStoragePoolObj *pool,
|
|
||||||
virStorageVolDef *vol)
|
|
||||||
{
|
|
||||||
virStoragePoolDef *def = virStoragePoolObjGetDef(pool);
|
|
||||||
|
|
||||||
if (vol->target.encryption != NULL) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
"%s", _("storage pool does not support encrypted "
|
|
||||||
"volumes"));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
vol->type = VIR_STORAGE_VOL_NETWORK;
|
|
||||||
|
|
||||||
VIR_FREE(vol->key);
|
|
||||||
vol->key = g_strdup_printf("%s/%s", def->source.name, vol->name);
|
|
||||||
|
|
||||||
VIR_FREE(vol->target.path);
|
|
||||||
vol->target.path = g_strdup(vol->name);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virStorageBackendSheepdogBuildVol(virStoragePoolObj *pool,
|
|
||||||
virStorageVolDef *vol,
|
|
||||||
unsigned int flags)
|
|
||||||
{
|
|
||||||
g_autoptr(virCommand) cmd = NULL;
|
|
||||||
|
|
||||||
virCheckFlags(0, -1);
|
|
||||||
|
|
||||||
if (!vol->target.capacity) {
|
|
||||||
virReportError(VIR_ERR_NO_SUPPORT, "%s",
|
|
||||||
_("volume capacity required for this pool"));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "create", vol->name, NULL);
|
|
||||||
virCommandAddArgFormat(cmd, "%llu", vol->target.capacity);
|
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
|
||||||
return virCommandRun(cmd, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
virStorageBackendSheepdogParseVdiList(virStorageVolDef *vol,
|
|
||||||
char *output)
|
|
||||||
{
|
|
||||||
/* fields:
|
|
||||||
* current/clone/snapshot, name, id, size, used, shared, creation time, vdi id, [tag]
|
|
||||||
*
|
|
||||||
* example output:
|
|
||||||
* s test 1 10 0 0 1336556634 7c2b25
|
|
||||||
* s test 2 10 0 0 1336557203 7c2b26
|
|
||||||
* = test 3 10 0 0 1336557216 7c2b27
|
|
||||||
*/
|
|
||||||
|
|
||||||
int id;
|
|
||||||
const char *p, *next;
|
|
||||||
|
|
||||||
vol->target.allocation = vol->target.capacity = 0;
|
|
||||||
|
|
||||||
p = output;
|
|
||||||
do {
|
|
||||||
char *end;
|
|
||||||
|
|
||||||
if ((next = strchr(p, '\n')))
|
|
||||||
++next;
|
|
||||||
|
|
||||||
/* ignore snapshots */
|
|
||||||
if (*p != '=')
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* skip space */
|
|
||||||
if (p + 2 < next)
|
|
||||||
p += 2;
|
|
||||||
else
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
/* skip name */
|
|
||||||
while (*p != '\0' && *p != ' ') {
|
|
||||||
if (*p == '\\')
|
|
||||||
++p;
|
|
||||||
++p;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (virStrToLong_i(p, &end, 10, &id) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
p = end + 1;
|
|
||||||
|
|
||||||
if (virStrToLong_ull(p, &end, 10, &vol->target.capacity) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
p = end + 1;
|
|
||||||
|
|
||||||
if (virStrToLong_ull(p, &end, 10, &vol->target.allocation) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
} while ((p = next));
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
virStorageBackendSheepdogRefreshVol(virStoragePoolObj *pool,
|
|
||||||
virStorageVolDef *vol)
|
|
||||||
{
|
|
||||||
char *output = NULL;
|
|
||||||
virStoragePoolDef *def = virStoragePoolObjGetDef(pool);
|
|
||||||
g_autoptr(virCommand) cmd = NULL;
|
|
||||||
|
|
||||||
cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "list", vol->name, "-r", NULL);
|
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
|
||||||
virCommandSetOutputBuffer(cmd, &output);
|
|
||||||
if (virCommandRun(cmd, NULL) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (virStorageBackendSheepdogParseVdiList(vol, output) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
vol->type = VIR_STORAGE_VOL_NETWORK;
|
|
||||||
|
|
||||||
VIR_FREE(vol->key);
|
|
||||||
vol->key = g_strdup_printf("%s/%s", def->source.name, vol->name);
|
|
||||||
|
|
||||||
VIR_FREE(vol->target.path);
|
|
||||||
vol->target.path = g_strdup(vol->name);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virStorageBackendSheepdogResizeVol(virStoragePoolObj *pool,
|
|
||||||
virStorageVolDef *vol,
|
|
||||||
unsigned long long capacity,
|
|
||||||
unsigned int flags)
|
|
||||||
{
|
|
||||||
g_autoptr(virCommand) cmd = NULL;
|
|
||||||
|
|
||||||
virCheckFlags(0, -1);
|
|
||||||
|
|
||||||
cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "resize", vol->name, NULL);
|
|
||||||
virCommandAddArgFormat(cmd, "%llu", capacity);
|
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
|
||||||
return virCommandRun(cmd, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
virStorageBackend virStorageBackendSheepdog = {
|
|
||||||
.type = VIR_STORAGE_POOL_SHEEPDOG,
|
|
||||||
|
|
||||||
.refreshPool = virStorageBackendSheepdogRefreshPool,
|
|
||||||
.createVol = virStorageBackendSheepdogCreateVol,
|
|
||||||
.buildVol = virStorageBackendSheepdogBuildVol,
|
|
||||||
.refreshVol = virStorageBackendSheepdogRefreshVol,
|
|
||||||
.deleteVol = virStorageBackendSheepdogDeleteVol,
|
|
||||||
.resizeVol = virStorageBackendSheepdogResizeVol,
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
virStorageBackendSheepdogRegister(void)
|
|
||||||
{
|
|
||||||
return virStorageBackendRegister(&virStorageBackendSheepdog);
|
|
||||||
}
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
/*
|
|
||||||
* storage_backend_sheepdog.h: storage backend for Sheepdog handling
|
|
||||||
*
|
|
||||||
* Copyright (C) 2012 Wido den Hollander
|
|
||||||
* Copyright (C) 2012 Frank Spijkerman
|
|
||||||
* Copyright (C) 2012 Sebastian Wiedenroth
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library. If not, see
|
|
||||||
* <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
int virStorageBackendSheepdogRegister(void);
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
/*
|
|
||||||
* storage_backend_sheepdog_priv.h: header for functions necessary in tests
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library. If not, see
|
|
||||||
* <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW
|
|
||||||
# error "storage_backend_sheepdog_priv.h may only be included by storage_backend_sheepdog.c or test suites"
|
|
||||||
#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW */
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "conf/storage_conf.h"
|
|
||||||
|
|
||||||
int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDef *pool,
|
|
||||||
char *output);
|
|
||||||
int virStorageBackendSheepdogParseVdiList(virStorageVolDef *vol,
|
|
||||||
char *output);
|
|
||||||
Loading…
x
Reference in New Issue
Block a user