We had hosted some changes to an old version of glusterfs (3.6.1) in order to incorporate ZFS snapshot support for gluster snapshot commands. These have been done quite a while back and were not forward ported to newer versions of glusterfs. I have a couple of questions on this :
1. If one needs to incorporate these changes in their current or modified form into the glusterfs master, what is the procedure to do so?
2. Since the above process may take longer to roll in, we would like to get the changes into at least the latest version of the 3.6 branch. In order to do this, I tried the following and needed some help :
I tried to apply the two ZFS relates commits (https://github.com/fractalio/glusterfs/commits/release-3.6) to the latest gluster code in the guster-3.6 branch. I hit one merge conflict per commit, both in xlators/mgmt/glusterd/src/glusterd-snapshot.c. The attached glusterd-snapshot.c_1 is the file with the merge conflicts after applying the first commit and glusterd-snapshot.c_2 is the one applying the second commit. In order to process, I removed the HEAD changes in each of the merge conflicts and proceeded just to see if anything else breaks but it went through. glusterd-snapshot.c_1_corrected and glusterd-snapshot.c_2_corrected and the corresponding files after removing the merge conflicts.
The question I had is, are the changes that I made to correct the merge conflicts safe? If not, could someone provide some suggestions on how to correct the two conflicts?
The file cmd_log contains the history of commands that I went through in the process..
-Ram
Attachment:
cmd_log
Description: Binary data
Attachment:
glusterd-snapshot.c_1
Description: Binary data
Attachment:
glusterd-snapshot.c_1_corrected
Description: Binary data
Attachment:
glusterd-snapshot.c_2
Description: Binary data
Attachment:
glusterd-snapshot.c_2_corrected
Description: Binary data
_______________________________________________ Gluster-devel mailing list Gluster-devel@xxxxxxxxxxx http://www.gluster.org/mailman/listinfo/gluster-devel
