Skip to content

/ saltfs

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

Bump Salt to 2018.3.2 #863

Merged
merged 8 commits into from Jul 25, 2018
Merged

Bump Salt to 2018.3.2 #863

merged 8 commits into from Jul 25, 2018
+18 −798

Conversation

@Manishearth
Copy link
Member

Manishearth commented Jul 23, 2018 •
edited

Homebrew is no longer compatible with the old version of salt which we
pin, update to a new one.

Previously: 87d9741

saltfs-migration: Upgrade Salt on all machines. Steps:

  • Stop all salt-master and salt-minion services. Because we're upgrading
    Salt by two major versions at once, there are no guarantees that the
    masters and minions with different versions will be able to
    communicate.
  • Use the install script to re-install Salt on each machine, the master
    first then the minion.
  • Restart the salt-master and salt-minion services; pay attention to the
    system logs in case of startup failure.
  • Do NOT run a highstate until all minions and masters have been updated
    to Salt 2018.3.2

This change is Reviewable
@Manishearth Manishearth force-pushed the Manishearth:update-salt branch 7 times, most recently from 6830bf7 to 17f6881 Jul 23, 2018
@Manishearth
Copy link
Member Author

Manishearth commented Jul 23, 2018

It's unable to install ttf-mscorefonts-installer , hmm
@Manishearth Manishearth force-pushed the Manishearth:update-salt branch 11 times, most recently from 27ca119 to 97646fb Jul 24, 2018
@Manishearth
Copy link
Member Author

Manishearth commented Jul 25, 2018

So the core problem here is that in late 2016 Salt's archive.extracted started verifying that files got extracted

Which causes two problems:

  • It takes forever to do this for the bajillion files in the NDK/SDK archives (solution: we actually don't need salt to do this anyway)
  • For some reason it can't find libglut.so.3 in the https://servo-rust.s3.amazonaws.com/ARM/armhf-trusty-libs/v2/armhf-trusty-libs-v2.tgz archive. That file is present in the archive, but when extracted on the server libglut.so.3 is owned by servo (and all other files by root) and I don't know why (this may be a symptom of not being able to find the file, not a cause?)
@Manishearth Manishearth force-pushed the Manishearth:update-salt branch from f474ae5 to c31eb36 Jul 25, 2018
@Manishearth
Copy link
Member Author

Manishearth commented Jul 25, 2018

ohhh we use a forked archive state, which causes some diversion here

see 11d4ac1

unforking since this has probably been fixed and either way we don't fetch zips anymore (?)
@Manishearth Manishearth force-pushed the Manishearth:update-salt branch from 1d2a8ba to 0538850 Jul 25, 2018
@Manishearth
Copy link
Member Author

Manishearth commented Jul 25, 2018

Okay, this is ready. r? @jdm @edunham @aneeshusa

Should I deploy this upgrade first before landing so that we know it works?
@Manishearth Manishearth force-pushed the Manishearth:update-salt branch from 0538850 to 0b1dd09 Jul 25, 2018
@jdm
Copy link
Member

jdm commented Jul 25, 2018

Yes, I would deploy then merge.
@aneeshusa
aneeshusa reviewed Jul 25, 2018
View changes
Copy link
Member

aneeshusa left a comment

Please also update the top.sls to remove the android reference.
.travis/install_salt.sh Outdated
brew unlink saltstack
fi
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/9e3a66b6b7ca978bfea86897dcc3391c37f9f0ef/Formula/saltstack.rb
brew install --force https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/salt.rb

This comment has been minimized.

Sign in to view
@aneeshusa

aneeshusa Jul 25, 2018

Member

Please pin to a specific version, otherwise we'll end with up macOS builders all having different versions depending on what's in master when they come up.

This comment has been minimized.

Sign in to view
@Manishearth

Manishearth Jul 25, 2018

Author Member

oh oops I was doing this but I probably copied the wrong URL at the end
@aneeshusa
Copy link
Member

aneeshusa commented Jul 25, 2018 •
edited

Looks good at a glance other than that, good luck :)
Manishearth added 3 commits Jul 24, 2018
@Manishearth
Remove ndk from salt
f36daa1 
Servo handles this now
@Manishearth
Remove sdk tests
1917bbe
@Manishearth
Archive user
a69ed0e 
More old deprecated stuff we're supposed to remove
@Manishearth
Copy link
Member Author

Manishearth commented Jul 25, 2018

We still need the android reference, we just don't need the NDK bits.
@Manishearth Manishearth force-pushed the Manishearth:update-salt branch from 0b1dd09 to 869bde5 Jul 25, 2018
@Manishearth
Copy link
Member Author

Manishearth commented Jul 25, 2018

@bors-servo r=jdm,aneeshusa

deployed, except on servo-mac 1-3 and servo-linux3 (these are down for now, I'll upgrade them later)
@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2018

📌 Commit 869bde5 has been approved by jdm,aneeshusa
@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2018

⌛ Testing commit 869bde5 with merge b7280bf...
bors-servo added a commit that referenced this pull request Jul 25, 2018
@bors-servo
Auto merge of #863 - Manishearth:update-salt, r=jdm,aneeshusa
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b7280bf 
[do not merge] Bump Salt to 2018.3.2

Homebrew is no longer compatible with the old version of salt which we
pin, update to a new one.

Previously: 87d9741

saltfs-migration: Upgrade Salt on all machines. Steps:
- Stop all salt-master and salt-minion services. Because we're upgrading
  Salt by two major versions at once, there are no guarantees that the
  masters and minions with different versions will be able to
  communicate.
- Use the install script to re-install Salt on each machine, the master
  first then the minion.
- Restart the salt-master and salt-minion services; pay attention to the
  system logs in case of startup failure.
- Do NOT run a highstate until all minions and masters have been updated
  to Salt 2016.3.0.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/863)
<!-- Reviewable:end -->
@Manishearth Manishearth changed the title [do not merge] Bump Salt to 2018.3.2 Bump Salt to 2018.3.2 Jul 25, 2018
@Manishearth
Stop using old archive.py
Loading status checks…
147dd18 
This was a workaround for a python bug with zip files, but now we don't have any zip files being
downloaded and the bug is likely fixed. The new one causes weird
problems with the new salt, stop including it so that we use the updated
one shipped with salt instead.
@Manishearth Manishearth force-pushed the Manishearth:update-salt branch from 869bde5 to 147dd18 Jul 25, 2018
@Manishearth
Copy link
Member Author

Manishearth commented Jul 25, 2018

@bors-servo r=jdm,aneeshusa
@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2018

📌 Commit 147dd18 has been approved by jdm,aneeshusa
@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2018

⌛ Testing commit 147dd18 with merge cd2e345...
bors-servo added a commit that referenced this pull request Jul 25, 2018
@bors-servo
Auto merge of #863 - Manishearth:update-salt, r=jdm,aneeshusa
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
cd2e345 
Bump Salt to 2018.3.2

Homebrew is no longer compatible with the old version of salt which we
pin, update to a new one.

Previously: 87d9741

saltfs-migration: Upgrade Salt on all machines. Steps:
- Stop all salt-master and salt-minion services. Because we're upgrading
  Salt by two major versions at once, there are no guarantees that the
  masters and minions with different versions will be able to
  communicate.
- Use the install script to re-install Salt on each machine, the master
  first then the minion.
- Restart the salt-master and salt-minion services; pay attention to the
  system logs in case of startup failure.
- Do NOT run a highstate until all minions and masters have been updated
  to Salt 2018.3.2

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/863)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2018

☀️ Test successful - status-travis
Approved by: jdm,aneeshusa
Pushing cd2e345 to master...
@bors-servo bors-servo merged commit 147dd18 into servo:master Jul 25, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Jul 25, 2018
Merged
Closed
@Manishearth Manishearth deleted the Manishearth:update-salt branch Jul 25, 2018
@jdm jdm removed the S-needs-deploy label Jul 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aneeshusa aneeshusa

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@Manishearth @jdm @aneeshusa @bors-servo @highfive
You can’t perform that action at this time.