On 12/27/2009 07:29 PM, Piavlo wrote:
> Hi,
>
> The patched sheepdog version now immediately fails with:
>
> shell-srv1> kvm-img convert -f raw -O sheepdog /dev/sys/kvm-img zopa
> find_vdi_name 1041: Invalid error code, zopa
> find_vdi_name 1041: Invalid error code, zopa
> qemu-img: Could not open 'zopa'
> shell-srv1>
Sorry for inconvenience. Could you try the following?
This depends on the patch I sent yesterday.
==
diff --git a/collie/vdi.c b/collie/vdi.c
index 290d919..f2acc9d 100644
--- a/collie/vdi.c
+++ b/collie/vdi.c
@@ -170,10 +170,6 @@ int lookup_vdi(struct cluster_info *ci,
nr_reqs = nr_nodes;
memset(&req, 0, sizeof(req));
- copies = rsp->copies;
- nr_reqs = copies;
- if (nr_reqs > nr_nodes)
- nr_reqs = nr_nodes;
req.opcode = SD_OP_SO_LOOKUP_VDI;
req.tag = tag;
@@ -188,7 +184,10 @@ int lookup_vdi(struct cluster_info *ci,
dprintf("looking for %s %lx\n", filename, *oid);
- return ret;
+ if (ret < 0)
+ return rsp->result;
+
+ return SD_RES_SUCCESS;
}
/* todo: cleanup with the above */
|
|