Included partial updates for long running jobs on the updated code.#2
Included partial updates for long running jobs on the updated code.#2namrata-simha wants to merge 2 commits intomichaelsevilla:masterfrom
Conversation
Signed-off-by: Michael Sevilla <mikesevilla3@gmail.com>
|
Thanks! I'm going to start working through this. |
There was a problem hiding this comment.
This is awesome. Thanks. The code looks good and you knew what you were doing. :)
Overall, I was a little confused about some of the lines that you added that didn't look related to your project. Did you cp files from the docker container to your Ceph branch? Then did you issue the pull request from there? Because all your code is based off my master branch even though that branch didn't have CudeleFS stuff.
If this was the case, we need to rebase your code off the "CudeleFS" branch. Let me know and we can start figuring this out. It may take a while but I really want this code. ;)
src/tools/cephfs/JournalTool.cc
Outdated
| << " --inode=<integer>\n" | ||
| << " --type=<UPDATE|OPEN|SESSION...><\n" | ||
| << " --frag=<ino>.<frag> [--dname=<dentry string>]\n" | ||
| << " --alternate-pool=pool-name\n" |
There was a problem hiding this comment.
Are these your changes? They look unrelated to your project.
| rank_str = "0"; | ||
| } | ||
|
|
||
| dout(10) << "JournalTool::main rank_str=" << rank_str << dendl; |
There was a problem hiding this comment.
Again -- this looks unrelated. I'm thinking you copied code from the docker container and then issued the pull request. So its confusing as to what your code is versus mine and the Ceph guy's.
There was a problem hiding this comment.
Yes, I don't know what this is either. If you want, I can mark the code that I've written with comments or such for you to know what I've written. My code is mostly localized to the area where I have commented from where I have set an update interval, as you have mentioned below:
| start = std::clock(); | ||
| //spawn child process for background update | ||
| pid_t pid = fork(); | ||
| if(pid == 0){ |
There was a problem hiding this comment.
Nice. This is a good way to do this.
There was a problem hiding this comment.
However, as you said, all your changes also seem to have come into my commit because your Ceph branch didn't have any of the Cudele stuff. Please tell me if there is a better way to do this to fix this issue.
| } | ||
|
|
||
| // write all events to disk (without a header) | ||
| events_b1.write_file(file.c_str()); |
There was a problem hiding this comment.
Now that the file is sitting on disk, how does it get merged into the metadata server?
This wasn't a requirement for the project -- as I can write a little script that does it. I was just wondering if you had implemented somewhere.
There was a problem hiding this comment.
I have done the merges to the metadata server in the child process, as in what comes after the previous code snippet.
|
Yes, before I committed, I had a little bit of that confusion, because I did cp files from the docker container to your Ceph branch and then issue a pull request, as you said, and the commit showed a lot more lines than I had originally written. I wasn't sure what was yours and what was new, so I didn't know what to remove and what not to. Should I have done it in another way? |
michaelsevilla
force-pushed
the
master
branch
from
6459c88 to
5cfe11e
Compare
2 participants
CMPS229_Project_Report.pdf