-
Notifications
You must be signed in to change notification settings - Fork 516
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Persist package installation across reboots #1185
Persist package installation across reboots #1185
Conversation
@tedsta another one for you - please take a look. |
|
||
FLAGS = flags.FLAGS | ||
|
||
GIT_REPO = 'https://github.com/aerospike/aerospike-server.git' | ||
GIT_TAG = '3.7.5' | ||
AEROSPIKE_DIR = '%s/aerospike-server' % vm_util.VM_TMP_DIR | ||
AEROSPIKE_DIR = '%s/aerospike-server' % INSTALL_DIR |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I appreciate making the change look like the previous item but can we use the same posixpath.join(x,y)
as used elsewhere?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code seems to be split about 50/50. You'll notice that most of the places where I changed vm_util.VM_TMP_DIR to INSTALL_DIR use format strings.
I don't mind changing everything to posixpath.join, but I'd prefer to do it as a follow-on commit. I'll change everything, including the stuff that still uses VM_TMP_DIR. I'm also willing to change everything to use format strings -- that'd be my preference since posixpath.join() is just as portable as '%s/%s', but I'm not picky.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good
@@ -11,7 +11,7 @@ | |||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
# See the License for the specific language governing permissions and | |||
# limitations under the License. | |||
"""Builds collectd from source, installs to VM_TMP_DIR. | |||
"""Builds collectd from source, installs to /opt/pkb. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe just say installs to INSTALL_DIR
so that we won't have to change it again
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
Is this meant to change all the installation directories in all benchmarks? |
Unfortunately I don't think github allows me to comment on code that's not in the vicinity of changes, but: In I noticed |
0c6269e
to
e007c94
Compare
@tedsta wrote:
Good catch. I've fixed these.
I'm not sure where you mean. There isn't any function called CleanupPackages anywhere. |
@cwilkes wrote:
I had looked through with |
Sorry, meant |
@tedsta I did modify PackageCleanup to delete /opt/pkb instead of /tmp/pkb since none of the packages install stuff to /tmp/pkb anymore. |
Rather than installing stuff in /tmp/pkb, which gets wiped out on reboot, use /opt/pkb. Keeping packages around after a reboot is essential for re-using the perfkitbenchmarker.linux_packages.* code for image preparation.
e007c94
to
a78d7d5
Compare
@cwilkes There were two more places where vm_util.VM_TMP was being used as an installation directory: sysbench05plus and scimark2. I've fixed these. Please take another look. |
This LGTM, but maybe we should wait for @cwilkes to give his approval too |
Looks good to me |
Rather than installing stuff in /tmp/pkb, which gets wiped out on
reboot, use /opt/pkb. Keeping packages around after a reboot is
essential for re-using the perfkitbenchmarker.linux_packages.* code
for image preparation.