2012-07-25 21:08:25 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2012 Alexander Block. All rights reserved.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public
|
|
|
|
* License v2 as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program 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
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public
|
|
|
|
* License along with this program; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 021110-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define _GNU_SOURCE
|
|
|
|
|
2012-09-20 21:26:28 +00:00
|
|
|
#include "kerncompat.h"
|
|
|
|
|
2012-07-25 21:08:25 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <dirent.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <pthread.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/ioctl.h>
|
2012-08-09 16:48:29 +00:00
|
|
|
#include <libgen.h>
|
2012-08-20 11:40:18 +00:00
|
|
|
#include <mntent.h>
|
2013-06-26 15:17:57 +00:00
|
|
|
#include <assert.h>
|
2012-07-25 21:08:25 +00:00
|
|
|
|
|
|
|
#include <uuid/uuid.h>
|
|
|
|
|
|
|
|
#include "ctree.h"
|
|
|
|
#include "ioctl.h"
|
|
|
|
#include "commands.h"
|
|
|
|
#include "list.h"
|
|
|
|
|
|
|
|
#include "send.h"
|
|
|
|
#include "send-utils.h"
|
|
|
|
|
|
|
|
static int g_verbose = 0;
|
|
|
|
|
|
|
|
struct btrfs_send {
|
|
|
|
int send_fd;
|
|
|
|
int dump_fd;
|
|
|
|
int mnt_fd;
|
|
|
|
|
|
|
|
u64 *clone_sources;
|
|
|
|
u64 clone_sources_count;
|
|
|
|
|
|
|
|
char *root_path;
|
|
|
|
struct subvol_uuid_search sus;
|
|
|
|
};
|
|
|
|
|
|
|
|
int find_mount_root(const char *path, char **mount_root)
|
|
|
|
{
|
2012-08-20 11:40:18 +00:00
|
|
|
FILE *mnttab;
|
2012-07-25 21:08:25 +00:00
|
|
|
int fd;
|
2012-08-20 11:40:18 +00:00
|
|
|
struct mntent *ent;
|
|
|
|
int len;
|
|
|
|
int longest_matchlen = 0;
|
|
|
|
char *longest_match = NULL;
|
2012-07-25 21:08:25 +00:00
|
|
|
|
|
|
|
fd = open(path, O_RDONLY | O_NOATIME);
|
2012-08-20 11:40:18 +00:00
|
|
|
if (fd < 0)
|
|
|
|
return -errno;
|
2012-07-25 21:08:25 +00:00
|
|
|
close(fd);
|
|
|
|
|
2013-03-25 14:21:42 +00:00
|
|
|
mnttab = fopen("/proc/mounts", "r");
|
2012-08-20 11:40:18 +00:00
|
|
|
while ((ent = getmntent(mnttab))) {
|
|
|
|
len = strlen(ent->mnt_dir);
|
|
|
|
if (strncmp(ent->mnt_dir, path, len) == 0) {
|
|
|
|
/* match found */
|
|
|
|
if (longest_matchlen < len) {
|
|
|
|
free(longest_match);
|
|
|
|
longest_matchlen = len;
|
|
|
|
longest_match = strdup(ent->mnt_dir);
|
|
|
|
}
|
2012-07-25 21:08:25 +00:00
|
|
|
}
|
|
|
|
}
|
2013-04-09 17:08:31 +00:00
|
|
|
fclose(mnttab);
|
2012-07-25 21:08:25 +00:00
|
|
|
|
2013-04-09 17:08:45 +00:00
|
|
|
if (!longest_match) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"ERROR: Failed to find mount root for path %s.\n",
|
|
|
|
path);
|
|
|
|
return -ENOENT;
|
|
|
|
}
|
|
|
|
|
2012-08-20 11:40:18 +00:00
|
|
|
*mount_root = realpath(longest_match, NULL);
|
|
|
|
free(longest_match);
|
2012-07-25 21:08:25 +00:00
|
|
|
|
2012-08-20 11:40:18 +00:00
|
|
|
return 0;
|
2012-07-25 21:08:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int get_root_id(struct btrfs_send *s, const char *path, u64 *root_id)
|
|
|
|
{
|
|
|
|
struct subvol_info *si;
|
|
|
|
|
|
|
|
si = subvol_uuid_search(&s->sus, 0, NULL, 0, path,
|
|
|
|
subvol_search_by_path);
|
|
|
|
if (!si)
|
|
|
|
return -ENOENT;
|
|
|
|
*root_id = si->root_id;
|
2013-06-26 15:17:57 +00:00
|
|
|
free(si->path);
|
|
|
|
free(si);
|
2012-07-25 21:08:25 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct subvol_info *get_parent(struct btrfs_send *s, u64 root_id)
|
|
|
|
{
|
2013-06-26 15:17:57 +00:00
|
|
|
struct subvol_info *si_tmp;
|
2012-07-25 21:08:25 +00:00
|
|
|
struct subvol_info *si;
|
|
|
|
|
2013-06-26 15:17:57 +00:00
|
|
|
si_tmp = subvol_uuid_search(&s->sus, root_id, NULL, 0, NULL,
|
2012-07-25 21:08:25 +00:00
|
|
|
subvol_search_by_root_id);
|
2013-06-26 15:17:57 +00:00
|
|
|
if (!si_tmp)
|
2012-07-25 21:08:25 +00:00
|
|
|
return NULL;
|
|
|
|
|
2013-06-26 15:17:57 +00:00
|
|
|
si = subvol_uuid_search(&s->sus, 0, si_tmp->parent_uuid, 0, NULL,
|
2012-07-25 21:08:25 +00:00
|
|
|
subvol_search_by_uuid);
|
2013-06-26 15:17:57 +00:00
|
|
|
free(si_tmp->path);
|
|
|
|
free(si_tmp);
|
2012-07-25 21:08:25 +00:00
|
|
|
return si;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int find_good_parent(struct btrfs_send *s, u64 root_id, u64 *found)
|
|
|
|
{
|
|
|
|
int ret;
|
2013-06-26 15:17:57 +00:00
|
|
|
struct subvol_info *parent = NULL;
|
|
|
|
struct subvol_info *parent2 = NULL;
|
2012-07-25 21:08:25 +00:00
|
|
|
struct subvol_info *best_parent = NULL;
|
|
|
|
__s64 tmp;
|
|
|
|
u64 best_diff = (u64)-1;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
parent = get_parent(s, root_id);
|
|
|
|
if (!parent) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < s->clone_sources_count; i++) {
|
|
|
|
if (s->clone_sources[i] == parent->root_id) {
|
|
|
|
best_parent = parent;
|
2013-06-26 15:17:57 +00:00
|
|
|
parent = NULL;
|
2012-07-25 21:08:25 +00:00
|
|
|
goto out_found;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < s->clone_sources_count; i++) {
|
|
|
|
parent2 = get_parent(s, s->clone_sources[i]);
|
2013-06-26 15:17:57 +00:00
|
|
|
if (!parent2)
|
2012-07-25 21:08:25 +00:00
|
|
|
continue;
|
2013-06-26 15:17:57 +00:00
|
|
|
if (parent2->root_id != parent->root_id) {
|
|
|
|
free(parent2->path);
|
|
|
|
free(parent2);
|
|
|
|
parent2 = NULL;
|
|
|
|
continue;
|
|
|
|
}
|
2012-07-25 21:08:25 +00:00
|
|
|
|
2013-06-26 15:17:57 +00:00
|
|
|
free(parent2->path);
|
|
|
|
free(parent2);
|
2012-07-25 21:08:25 +00:00
|
|
|
parent2 = subvol_uuid_search(&s->sus, s->clone_sources[i], NULL,
|
|
|
|
0, NULL, subvol_search_by_root_id);
|
|
|
|
|
2013-06-26 15:17:57 +00:00
|
|
|
assert(parent2);
|
2012-07-25 21:08:25 +00:00
|
|
|
tmp = parent2->ctransid - parent->ctransid;
|
|
|
|
if (tmp < 0)
|
|
|
|
tmp *= -1;
|
|
|
|
if (tmp < best_diff) {
|
2013-06-26 15:17:57 +00:00
|
|
|
if (best_parent) {
|
|
|
|
free(best_parent->path);
|
|
|
|
free(best_parent);
|
|
|
|
}
|
2013-01-24 11:53:40 +00:00
|
|
|
best_parent = parent2;
|
2013-06-26 15:17:57 +00:00
|
|
|
parent2 = NULL;
|
2012-07-25 21:08:25 +00:00
|
|
|
best_diff = tmp;
|
2013-06-26 15:17:57 +00:00
|
|
|
} else {
|
|
|
|
free(parent2->path);
|
|
|
|
free(parent2);
|
|
|
|
parent2 = NULL;
|
2012-07-25 21:08:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!best_parent) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
out_found:
|
|
|
|
*found = best_parent->root_id;
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
out:
|
2013-06-26 15:17:57 +00:00
|
|
|
if (parent) {
|
|
|
|
free(parent->path);
|
|
|
|
free(parent);
|
|
|
|
}
|
|
|
|
if (best_parent) {
|
|
|
|
free(best_parent->path);
|
|
|
|
free(best_parent);
|
|
|
|
}
|
2012-07-25 21:08:25 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void add_clone_source(struct btrfs_send *s, u64 root_id)
|
|
|
|
{
|
|
|
|
s->clone_sources = realloc(s->clone_sources,
|
|
|
|
sizeof(*s->clone_sources) * (s->clone_sources_count + 1));
|
|
|
|
s->clone_sources[s->clone_sources_count++] = root_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int write_buf(int fd, const void *buf, int size)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
int pos = 0;
|
|
|
|
|
|
|
|
while (pos < size) {
|
|
|
|
ret = write(fd, (char*)buf + pos, size - pos);
|
|
|
|
if (ret < 0) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: failed to dump stream. %s",
|
|
|
|
strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (!ret) {
|
|
|
|
ret = -EIO;
|
|
|
|
fprintf(stderr, "ERROR: failed to dump stream. %s",
|
|
|
|
strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *dump_thread(void *arg_)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct btrfs_send *s = (struct btrfs_send*)arg_;
|
|
|
|
char buf[4096];
|
|
|
|
int readed;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
readed = read(s->send_fd, buf, sizeof(buf));
|
|
|
|
if (readed < 0) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: failed to read stream from "
|
|
|
|
"kernel. %s\n", strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (!readed) {
|
|
|
|
ret = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ret = write_buf(s->dump_fd, buf, readed);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (ret < 0) {
|
|
|
|
exit(-ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ERR_PTR(ret);
|
|
|
|
}
|
|
|
|
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
static int do_send(struct btrfs_send *send, u64 root_id, u64 parent_root_id,
|
|
|
|
int is_first_subvol, int is_last_subvol)
|
2012-07-25 21:08:25 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
pthread_t t_read;
|
|
|
|
pthread_attr_t t_attr;
|
|
|
|
struct btrfs_ioctl_send_args io_send;
|
|
|
|
struct subvol_info *si;
|
|
|
|
void *t_err = NULL;
|
|
|
|
int subvol_fd = -1;
|
2013-01-30 07:11:46 +00:00
|
|
|
int pipefd[2] = {-1, -1};
|
2012-07-25 21:08:25 +00:00
|
|
|
|
|
|
|
si = subvol_uuid_search(&send->sus, root_id, NULL, 0, NULL,
|
|
|
|
subvol_search_by_root_id);
|
|
|
|
if (!si) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
fprintf(stderr, "ERROR: could not find subvol info for %llu",
|
|
|
|
root_id);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
subvol_fd = openat(send->mnt_fd, si->path, O_RDONLY | O_NOATIME);
|
|
|
|
if (subvol_fd < 0) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: open %s failed. %s\n", si->path,
|
|
|
|
strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = pthread_attr_init(&t_attr);
|
|
|
|
|
|
|
|
ret = pipe(pipefd);
|
|
|
|
if (ret < 0) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: pipe failed. %s\n", strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-01-20 21:04:18 +00:00
|
|
|
memset(&io_send, 0, sizeof(io_send));
|
2012-07-25 21:08:25 +00:00
|
|
|
io_send.send_fd = pipefd[1];
|
|
|
|
send->send_fd = pipefd[0];
|
|
|
|
|
|
|
|
if (!ret)
|
|
|
|
ret = pthread_create(&t_read, &t_attr, dump_thread,
|
|
|
|
send);
|
|
|
|
if (ret) {
|
|
|
|
ret = -ret;
|
|
|
|
fprintf(stderr, "ERROR: thread setup failed: %s\n",
|
|
|
|
strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
io_send.clone_sources = (__u64*)send->clone_sources;
|
|
|
|
io_send.clone_sources_count = send->clone_sources_count;
|
2012-11-06 20:47:07 +00:00
|
|
|
io_send.parent_root = parent_root_id;
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
if (!is_first_subvol)
|
|
|
|
io_send.flags |= BTRFS_SEND_FLAG_OMIT_STREAM_HEADER;
|
|
|
|
if (!is_last_subvol)
|
|
|
|
io_send.flags |= BTRFS_SEND_FLAG_OMIT_END_CMD;
|
2012-07-25 21:08:25 +00:00
|
|
|
ret = ioctl(subvol_fd, BTRFS_IOC_SEND, &io_send);
|
|
|
|
if (ret) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: send ioctl failed with %d: %s\n", ret,
|
|
|
|
strerror(-ret));
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
if (ret == -EINVAL && (!is_first_subvol || !is_last_subvol))
|
|
|
|
fprintf(stderr,
|
|
|
|
"Try upgrading your kernel or don't use -e.\n");
|
2012-07-25 21:08:25 +00:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (g_verbose > 0)
|
|
|
|
fprintf(stderr, "BTRFS_IOC_SEND returned %d\n", ret);
|
|
|
|
|
|
|
|
if (g_verbose > 0)
|
|
|
|
fprintf(stderr, "joining genl thread\n");
|
|
|
|
|
|
|
|
close(pipefd[1]);
|
2013-06-26 15:17:57 +00:00
|
|
|
pipefd[1] = -1;
|
2012-07-25 21:08:25 +00:00
|
|
|
|
|
|
|
ret = pthread_join(t_read, &t_err);
|
|
|
|
if (ret) {
|
|
|
|
ret = -ret;
|
|
|
|
fprintf(stderr, "ERROR: pthread_join failed: %s\n",
|
|
|
|
strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (t_err) {
|
|
|
|
ret = (long int)t_err;
|
|
|
|
fprintf(stderr, "ERROR: failed to process send stream, ret=%ld "
|
|
|
|
"(%s)\n", (long int)t_err, strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_attr_destroy(&t_attr);
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (subvol_fd != -1)
|
|
|
|
close(subvol_fd);
|
2013-01-30 07:11:46 +00:00
|
|
|
if (pipefd[0] != -1)
|
2012-07-25 21:08:25 +00:00
|
|
|
close(pipefd[0]);
|
2013-01-30 07:11:46 +00:00
|
|
|
if (pipefd[1] != -1)
|
2012-07-25 21:08:25 +00:00
|
|
|
close(pipefd[1]);
|
2013-06-26 15:17:57 +00:00
|
|
|
if (si) {
|
|
|
|
free(si->path);
|
|
|
|
free(si);
|
|
|
|
}
|
2012-07-25 21:08:25 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-02-01 07:56:27 +00:00
|
|
|
char *get_subvol_name(char *mnt, char *full_path)
|
2012-07-25 21:08:25 +00:00
|
|
|
{
|
2013-02-01 07:56:27 +00:00
|
|
|
int len = strlen(mnt);
|
2012-08-09 16:48:29 +00:00
|
|
|
if (!len)
|
|
|
|
return full_path;
|
2013-02-01 07:56:27 +00:00
|
|
|
if (mnt[len - 1] != '/')
|
2012-08-09 16:48:29 +00:00
|
|
|
len += 1;
|
|
|
|
|
|
|
|
return full_path + len;
|
2012-07-25 21:08:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int init_root_path(struct btrfs_send *s, const char *subvol)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (s->root_path)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = find_mount_root(subvol, &s->root_path);
|
|
|
|
if (ret < 0) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
fprintf(stderr, "ERROR: failed to determine mount point "
|
|
|
|
"for %s\n", subvol);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
s->mnt_fd = open(s->root_path, O_RDONLY | O_NOATIME);
|
|
|
|
if (s->mnt_fd < 0) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: can't open '%s': %s\n", s->root_path,
|
|
|
|
strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = subvol_uuid_search_init(s->mnt_fd, &s->sus);
|
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "ERROR: failed to initialize subvol search. "
|
|
|
|
"%s\n", strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static int is_subvol_ro(struct btrfs_send *s, char *subvol)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
u64 flags;
|
|
|
|
int fd = -1;
|
|
|
|
|
|
|
|
fd = openat(s->mnt_fd, subvol, O_RDONLY | O_NOATIME);
|
|
|
|
if (fd < 0) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: failed to open %s. %s\n",
|
|
|
|
subvol, strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = ioctl(fd, BTRFS_IOC_SUBVOL_GETFLAGS, &flags);
|
|
|
|
if (ret < 0) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: failed to get flags for subvolume. "
|
|
|
|
"%s\n", strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & BTRFS_SUBVOL_RDONLY)
|
|
|
|
ret = 1;
|
|
|
|
else
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (fd != -1)
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int cmd_send_start(int argc, char **argv)
|
|
|
|
{
|
|
|
|
char *subvol = NULL;
|
2012-11-30 10:08:39 +00:00
|
|
|
int c;
|
2012-07-25 21:08:25 +00:00
|
|
|
int ret;
|
|
|
|
char *outname = NULL;
|
|
|
|
struct btrfs_send send;
|
|
|
|
u32 i;
|
|
|
|
char *mount_root = NULL;
|
|
|
|
char *snapshot_parent = NULL;
|
|
|
|
u64 root_id;
|
|
|
|
u64 parent_root_id = 0;
|
2012-11-06 20:47:07 +00:00
|
|
|
int full_send = 1;
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
int new_end_cmd_semantic = 0;
|
2012-07-25 21:08:25 +00:00
|
|
|
|
|
|
|
memset(&send, 0, sizeof(send));
|
|
|
|
send.dump_fd = fileno(stdout);
|
|
|
|
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
while ((c = getopt(argc, argv, "vec:f:i:p:")) != -1) {
|
2012-07-25 21:08:25 +00:00
|
|
|
switch (c) {
|
|
|
|
case 'v':
|
|
|
|
g_verbose++;
|
|
|
|
break;
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
case 'e':
|
|
|
|
new_end_cmd_semantic = 1;
|
|
|
|
break;
|
2012-11-06 20:47:07 +00:00
|
|
|
case 'c':
|
2012-07-25 21:08:25 +00:00
|
|
|
subvol = realpath(optarg, NULL);
|
|
|
|
if (!subvol) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: realpath %s failed. "
|
|
|
|
"%s\n", optarg, strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = init_root_path(&send, subvol);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
|
2013-02-01 07:56:27 +00:00
|
|
|
ret = get_root_id(&send, get_subvol_name(send.root_path, subvol),
|
2012-07-25 21:08:25 +00:00
|
|
|
&root_id);
|
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "ERROR: could not resolve "
|
|
|
|
"root_id for %s\n", subvol);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
add_clone_source(&send, root_id);
|
2013-04-09 17:08:34 +00:00
|
|
|
subvol_uuid_search_finit(&send.sus);
|
2012-07-25 21:08:25 +00:00
|
|
|
free(subvol);
|
2013-04-23 09:25:00 +00:00
|
|
|
subvol = NULL;
|
|
|
|
if (send.mnt_fd >= 0) {
|
|
|
|
close(send.mnt_fd);
|
|
|
|
send.mnt_fd = -1;
|
|
|
|
}
|
|
|
|
free(send.root_path);
|
|
|
|
send.root_path = NULL;
|
2012-11-06 20:47:07 +00:00
|
|
|
full_send = 0;
|
2012-07-25 21:08:25 +00:00
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
outname = optarg;
|
|
|
|
break;
|
|
|
|
case 'p':
|
2012-11-06 20:47:07 +00:00
|
|
|
if (snapshot_parent) {
|
|
|
|
fprintf(stderr, "ERROR: you cannot have more than one parent (-p)\n");
|
2013-04-23 09:25:00 +00:00
|
|
|
ret = 1;
|
|
|
|
goto out;
|
2012-11-06 20:47:07 +00:00
|
|
|
}
|
2012-07-25 21:08:25 +00:00
|
|
|
snapshot_parent = realpath(optarg, NULL);
|
|
|
|
if (!snapshot_parent) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: realpath %s failed. "
|
|
|
|
"%s\n", optarg, strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
2012-11-06 20:47:07 +00:00
|
|
|
full_send = 0;
|
2012-07-25 21:08:25 +00:00
|
|
|
break;
|
2012-11-06 20:47:07 +00:00
|
|
|
case 'i':
|
|
|
|
fprintf(stderr,
|
|
|
|
"ERROR: -i was removed, use -c instead\n");
|
2013-04-23 09:25:00 +00:00
|
|
|
ret = 1;
|
|
|
|
goto out;
|
2012-07-25 21:08:25 +00:00
|
|
|
case '?':
|
|
|
|
default:
|
|
|
|
fprintf(stderr, "ERROR: send args invalid.\n");
|
2013-04-23 09:25:00 +00:00
|
|
|
ret = 1;
|
|
|
|
goto out;
|
2012-07-25 21:08:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (optind == argc) {
|
|
|
|
fprintf(stderr, "ERROR: send needs path to snapshot\n");
|
2013-04-23 09:25:00 +00:00
|
|
|
ret = 1;
|
|
|
|
goto out;
|
2012-07-25 21:08:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (outname != NULL) {
|
|
|
|
send.dump_fd = creat(outname, 0600);
|
|
|
|
if (send.dump_fd == -1) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: can't create '%s': %s\n",
|
|
|
|
outname, strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-31 08:21:24 +00:00
|
|
|
if (isatty(send.dump_fd)) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"ERROR: not dumping send stream into a terminal, "
|
|
|
|
"redirect it into a file\n");
|
2013-04-23 09:25:00 +00:00
|
|
|
ret = 1;
|
|
|
|
goto out;
|
2013-01-31 08:21:24 +00:00
|
|
|
}
|
|
|
|
|
2012-07-25 21:08:25 +00:00
|
|
|
/* use first send subvol to determine mount_root */
|
|
|
|
subvol = argv[optind];
|
|
|
|
|
2012-08-09 16:48:29 +00:00
|
|
|
subvol = realpath(argv[optind], NULL);
|
|
|
|
if (!subvol) {
|
2012-08-10 02:46:16 +00:00
|
|
|
ret = -errno;
|
2012-08-09 16:48:29 +00:00
|
|
|
fprintf(stderr, "ERROR: unable to resolve %s\n", argv[optind]);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-07-25 21:08:25 +00:00
|
|
|
ret = init_root_path(&send, subvol);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (snapshot_parent != NULL) {
|
|
|
|
ret = get_root_id(&send,
|
2013-02-01 07:56:27 +00:00
|
|
|
get_subvol_name(send.root_path, snapshot_parent),
|
2012-07-25 21:08:25 +00:00
|
|
|
&parent_root_id);
|
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "ERROR: could not resolve root_id "
|
|
|
|
"for %s\n", snapshot_parent);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
add_clone_source(&send, parent_root_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = optind; i < argc; i++) {
|
2013-04-23 09:25:00 +00:00
|
|
|
free(subvol);
|
2012-08-09 16:48:29 +00:00
|
|
|
subvol = realpath(argv[i], NULL);
|
|
|
|
if (!subvol) {
|
2012-08-10 02:46:16 +00:00
|
|
|
ret = -errno;
|
2012-08-09 16:48:29 +00:00
|
|
|
fprintf(stderr, "ERROR: unable to resolve %s\n", argv[i]);
|
|
|
|
goto out;
|
|
|
|
}
|
2012-07-25 21:08:25 +00:00
|
|
|
|
|
|
|
ret = find_mount_root(subvol, &mount_root);
|
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "ERROR: find_mount_root failed on %s: "
|
|
|
|
"%s\n", subvol,
|
|
|
|
strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (strcmp(send.root_path, mount_root) != 0) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
fprintf(stderr, "ERROR: all subvols must be from the "
|
|
|
|
"same fs.\n");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
free(mount_root);
|
|
|
|
|
|
|
|
ret = is_subvol_ro(&send, subvol);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
if (!ret) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
fprintf(stderr, "ERROR: %s is not read-only.\n",
|
|
|
|
subvol);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = optind; i < argc; i++) {
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
int is_first_subvol;
|
|
|
|
int is_last_subvol;
|
|
|
|
|
2013-04-23 09:25:00 +00:00
|
|
|
free(subvol);
|
2012-07-25 21:08:25 +00:00
|
|
|
subvol = argv[i];
|
|
|
|
|
|
|
|
fprintf(stderr, "At subvol %s\n", subvol);
|
|
|
|
|
|
|
|
subvol = realpath(subvol, NULL);
|
|
|
|
if (!subvol) {
|
|
|
|
ret = -errno;
|
|
|
|
fprintf(stderr, "ERROR: realpath %s failed. "
|
|
|
|
"%s\n", argv[i], strerror(-ret));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-02-01 07:56:27 +00:00
|
|
|
ret = get_root_id(&send, get_subvol_name(send.root_path, subvol),
|
2012-07-25 21:08:25 +00:00
|
|
|
&root_id);
|
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "ERROR: could not resolve root_id "
|
|
|
|
"for %s\n", subvol);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-11-06 20:47:07 +00:00
|
|
|
if (!full_send && !parent_root_id) {
|
2012-07-25 21:08:25 +00:00
|
|
|
ret = find_good_parent(&send, root_id, &parent_root_id);
|
2012-11-06 20:47:07 +00:00
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "ERROR: parent determination failed for %lld\n",
|
|
|
|
root_id);
|
|
|
|
goto out;
|
|
|
|
}
|
2012-07-25 21:08:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = is_subvol_ro(&send, subvol);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
if (!ret) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
fprintf(stderr, "ERROR: %s is not read-only.\n",
|
|
|
|
subvol);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
if (new_end_cmd_semantic) {
|
|
|
|
/* require new kernel */
|
|
|
|
is_first_subvol = (i == optind);
|
|
|
|
is_last_subvol = (i == argc - 1);
|
|
|
|
} else {
|
|
|
|
/* be compatible to old and new kernel */
|
|
|
|
is_first_subvol = 1;
|
|
|
|
is_last_subvol = 1;
|
|
|
|
}
|
|
|
|
ret = do_send(&send, root_id, parent_root_id,
|
|
|
|
is_first_subvol, is_last_subvol);
|
2012-07-25 21:08:25 +00:00
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* done with this subvol, so add it to the clone sources */
|
|
|
|
add_clone_source(&send, root_id);
|
|
|
|
|
|
|
|
parent_root_id = 0;
|
2012-11-06 20:47:07 +00:00
|
|
|
full_send = 0;
|
2012-07-25 21:08:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
out:
|
2013-04-23 09:25:00 +00:00
|
|
|
free(subvol);
|
|
|
|
free(snapshot_parent);
|
|
|
|
free(send.clone_sources);
|
2012-07-25 21:08:25 +00:00
|
|
|
if (send.mnt_fd >= 0)
|
|
|
|
close(send.mnt_fd);
|
2013-04-23 09:25:00 +00:00
|
|
|
free(send.root_path);
|
2013-04-09 17:08:34 +00:00
|
|
|
subvol_uuid_search_finit(&send.sus);
|
2012-07-25 21:08:25 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char * const send_cmd_group_usage[] = {
|
|
|
|
"btrfs send <command> <args>",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2013-01-18 06:52:12 +00:00
|
|
|
const char * const cmd_send_usage[] = {
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
"btrfs send [-ve] [-p <parent>] [-c <clone-src>] <subvol>",
|
2012-07-25 21:08:25 +00:00
|
|
|
"Send the subvolume to stdout.",
|
|
|
|
"Sends the subvolume specified by <subvol> to stdout.",
|
2012-11-06 20:47:07 +00:00
|
|
|
"By default, this will send the whole subvolume. To do an incremental",
|
|
|
|
"send, use '-p <parent>'. If you want to allow btrfs to clone from",
|
|
|
|
"any additional local snapshots, use -c <clone-src> (multiple times",
|
|
|
|
"where applicable). You must not specify clone sources unless you",
|
|
|
|
"guarantee that these snapshots are exactly in the same state on both",
|
|
|
|
"sides, the sender and the receiver. It is allowed to omit the",
|
|
|
|
"'-p <parent>' option when '-c <clone-src>' options are given, in",
|
|
|
|
"which case 'btrfs send' will determine a suitable parent among the",
|
|
|
|
"clone sources itself.",
|
|
|
|
"\n",
|
2013-01-18 06:52:12 +00:00
|
|
|
"-v Enable verbose debug output. Each occurrence of",
|
2012-11-06 20:47:07 +00:00
|
|
|
" this option increases the verbose level more.",
|
Btrfs-progs: add send option for using new end-cmd semantic
This commit adds a command line option to enable sending streams
which make use of the new end-cmd semantic if multiple snapshots are
sent back-to-back. The goal is to use the <end cmd> as an indication
to stop reading the input stream. So far, the receiver could only
use EOF to recognize the end.
If the new command line option '-e' is set, this commit requires a
kernel which is able to support the new flags in the send ioctl. New
bits in the flags of the send ioctl will be set which cause EINVAL
on old kernels. However, if the option '-e' is not set, it works
with old and new kernels without any errors or any changed behavior.
This used to be the encoding (with 2 snapshots in this example):
<stream header> + <sequence of commands> + <end cmd> +
<stream header> + <sequence of commands> + <end cmd> + EOF
The new format (if the two new flags are used) is this one:
<stream header> + <sequence of commands> +
<sequence of commands> + <end cmd>
Note that the currently existing receivers treat <end cmd> only as
an indication that a new <stream header> is following. This means,
you can just skip the sequence <end cmd> <stream header> without
loosing compatibility. As long as an EOF is following, the currently
existing receivers handle the new format (if the two new flags are
used) exactly as the old one.
Also note that the kernel interface was changed in a way that is
backward compatible to old btrfs-progs tools. You set one or two bits
in the flags field of the ioctl to enable the new behavior. Old tools
set these flags to zero, thus getting exactly the same as they got
with older kernels. And this is exactly what happens if the new '-e'
option is not set, the new bits in the flags are not set and thus
old kernels and new kernels are both supported.
So what is the benefit of this change? The goal is to be able to use
a single stream (one TCP connection) to multiplex a request/response
handshake plus Btrfs send streams, all in the same stream. In this
case you cannot evaluate an EOF condition as an end of the Btrfs send
stream. You need something else, and the <end cmd> is just perfect
for this purpose.
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
2013-04-10 17:10:56 +00:00
|
|
|
"-e If sending multiple subvols at once, use the new",
|
|
|
|
" format and omit the end-cmd between the subvols.",
|
2012-11-06 20:47:07 +00:00
|
|
|
"-p <parent> Send an incremental stream from <parent> to",
|
|
|
|
" <subvol>.",
|
|
|
|
"-c <clone-src> Use this snapshot as a clone source for an ",
|
|
|
|
" incremental send (multiple allowed)",
|
|
|
|
"-f <outfile> Output is normally written to stdout. To write to",
|
|
|
|
" a file, use this option. An alternative would be to",
|
|
|
|
" use pipes.",
|
2012-07-25 21:08:25 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
int cmd_send(int argc, char **argv)
|
|
|
|
{
|
|
|
|
return cmd_send_start(argc, argv);
|
|
|
|
}
|