[presentations] master: Tweaks
[email protected] (Rasmus Lerdorf) Thu, 30 Sep 2021 22:08:43 +0000
| Newsgroups | php.pres |
|---|---|
| Message-ID | <[email protected]> |
Author: Rasmus Lerdorf (rlerdorf)
Date: 2021-09-30T15:09:12-07:00
Commit: https://github.com/php/presentations/commit/cd23ab7ec04fd6cf8f854ef1d4c8fdd15be8e400
Raw diff: https://github.com/php/presentations/commit/cd23ab7ec04fd6cf8f854ef1d4c8fdd15be8e400.diff
Tweaks
Changed paths:
M etsymex21.html
M etsymex21.xml
M slides/intro/deploy_2016.xml
M slides/intro/journey_etsy.xml
Diff:
diff --git a/etsymex21.html b/etsymex21.html
index 251add2a..30c51d28 100644
--- a/etsymex21.html
+++ b/etsymex21.html
@@ -425,8 +425,8 @@ <h1 style="text-align:center;">phpspy</h1>
<h1 style="text-align:center;">Let's deploy it!</h1>
</section>
<section id="deploy0" >
- <p class="p" style="font-size:2em;text-align:left;">Atomic</p>
- <p class="p" style="font-size:2em;text-align:left;">No performance hit</p>
+ <p class="p" style="font-size:1.7em;text-align:left;">Atomic</p>
+ <p class="p" style="font-size:1.7em;text-align:left;">No performance hit</p>
<ul>
<li style="font-size: 1.5em;">No restarts</li>
<li style="font-size: 1.5em;">No LB removal</li>
@@ -435,147 +435,40 @@ <h1 style="text-align:center;">Let's deploy it!</h1>
</ul>
</section>
<section id="deploy1" >
- <p class="p" style="font-size:1.1em;text-align:left;">Must be able to serve two versions of the site concurrently!</p>
+ <p class="p" style="font-size:1em;text-align:left;">Must be able to serve two versions of the site concurrently!</p>
<img src="/presentations/slides/intro/atomic_deploy1.png" width="" height="">
</section>
<section id="deploy2" >
<img src="/presentations/slides/intro/atomic_deploy2.png" width="" height="">
</section>
<section id="deploy3" >
- <p class="p" style="font-size:1.1em;text-align:left;">Requests that begin on DocumentRoot A must finish on A</p>
+ <p class="p" style="font-size:1em;text-align:left;">Requests that begin on DocumentRoot A must finish on A</p>
</section>
<section id="deploy4" >
- <p class="p" style="font-size:1.1em;text-align:left;">Set the DocumentRoot to symlink target!</p>
- <p class="p" style="font-size:1.1em;text-align:left;">Easy with nginx</p>
+ <p class="p" style="font-size:1em;text-align:left;">Set the DocumentRoot to symlink target!</p>
+ <p class="p" style="font-size:1em;text-align:left;">Easy with nginx</p>
<pre><code class="ini" data-trim style="font-size:1.1em;" >fastcgi_param DOCUMENT_ROOT $realpath_root</code></pre>
- <p class="p" style="font-size:1.1em;text-align:left;">Apache</p>
+ <p class="p" style="font-size:1em;text-align:left;">Apache</p>
<div align="left" style="font-size: 1.25em; color: ; text-align: left; margin-left: 1em; margin-right: ; margin-top: ; margin-bottom: ;"><a href="https://github.com/etsy/mod_realdoc" target="">github.com/etsy/mod_realdoc</a></div>
</section>
<section id="deploy5" >
- <p class="p" style="font-size:1.1em;text-align:left;">Avoid hardcoding full paths</p>
- <p class="p" style="font-size:1.1em;text-align:left;">Watch your include_path setting</p>
- <p class="p" style="font-size:1.1em;text-align:left;">incpath extension can resolve your include_path for you</p>
+ <p class="p" style="font-size:1em;text-align:left;">Avoid hardcoding full paths</p>
+ <p class="p" style="font-size:1em;text-align:left;">Watch your include_path setting</p>
+ <p class="p" style="font-size:1em;text-align:left;">incpath extension can resolve your include_path for you</p>
<div align="left" style="font-size: 1.25em; color: ; text-align: left; margin-left: 1em; margin-right: ; margin-top: ; margin-bottom: ;"><a href="https://github.com/etsy/incpath" target="">https://github.com/etsy/incpath</a></div>
<aside class="notes"><br />
some contraints...<br />
</aside>
</section>
<section id="deploy6" >
- <p class="p" style="font-size:1.1em;text-align:left;">Version all static assets</p>
- <p class="p" style="font-size:1.1em;text-align:left;">DB Schema changes need special care</p>
+ <p class="p" style="font-size:1em;text-align:left;">Version all static assets</p>
+ <p class="p" style="font-size:1em;text-align:left;">DB Schema changes need special care</p>
</section> </section>
<section>
- <section id="etsy_deploy">
- <h2 style="text-align:center;">How do you manage deploys?</h2>
-<aside class="notes"><br />
-ok, but how do you manage deploys with hundreds of developers?<br />
-</aside>
- </section>
- <section id="etsy_deploy0" >
- <p class="p" style="font-size:2em;text-align:left;">At Etsy we use <strike>irc</strike> Slack</p>
- <pre><code class="shell nohighlight" data-trim style="font-size:0.9em;" >Channel: #push Topic: <prod> *joe frank|bob
-devbot: Swapping symlinks. Your code is about to start taking production traffic
-pushbot: joe frank : Your code is live. Time to watch graphs: http://etsy/abcd
-Rasmus: .join
-*** pushbot has changed the topic on #push to <prod> joe frank|bob Rasmus
-frank: .good
-*** pushbot has changed the topic on #push to <prod> *joe *frank|bob Rasmus
-joe: .done
-*** pushbot has changed the topic on #push to <prod> bob Rasmus
-pushbot: bob Rasmus: You're up
-bob: .in
-*** pushbot has changed the topic on #push *bob Rasmus
-Rasmus: .in
-*** pushbot has changed the topic on #push *bob *Rasmus</code></pre>
-<aside class="notes"><br />
-.join in #push<br />
-</aside>
- </section>
- <section id="etsy_deploy1" >
- <p class="p" style="font-size:2em;text-align:left;">pushbot commands</p>
- <ul>
- <li style="list-style-type: none;"><strong>.join</strong> - join push queue</li>
- <li style="list-style-type: none;"><strong>.in</strong> - code has been pushed</li>
- <li style="list-style-type: none;"><strong>.good</strong> - your stuff looks good</li>
- <li style="list-style-type: none;"><strong>.uhoh</strong> - your stuff looks bad</li>
- <li style="list-style-type: none;"><strong>.hold</strong> - there is a problem, hold everything</li>
- <li style="list-style-type: none;"><strong>.nm</strong> - never mind (leave queue)</li>
- <li style="list-style-type: none;"><strong>.done</strong> - push done</li>
- </ul>
- </section>
- <section id="etsy_deploy2" >
- <img src="/presentations/slides/intro/deployinator.png" width="" height="">
- </section>
- <section id="etsy_deploy3" >
- <pre><code class="shell nohighlight" data-trim style="font-size:0.9em;" >Channel: #push Topic: <princess> bob Rasmus
-Jenkins: Starting build #36803 for job qa
-Jenkins: Starting build #38784 for job princess
-Jenkins: Project qa build #36803: SUCCESS in 6 min 19 sec: http://ci/job/qa/36803/
-pushbot: bob Rasmus : qa tests have passed
-devbot: [who_tried] Everyone in this push has run Try recently. w00t!
-Jenkins: Project princess build #38784: SUCCESS in 1 min 10 sec: http://ci/job/princess/38784/
-pushbot: bob Rasmus : princess tests have passed
-bob: .good
-Rasmus: .good
-*** pushbot has changed the topic on #push to <princess> *bob *Rasmus
-pushbot: bob Rasmus : everyone is ready, checking on Jenkins...
-Jenkins: qa: last build: 36803 (9 min 5 sec ago): SUCCESS: http://ci/job/qa/36803/
-Jenkins: princess: last build: 38784 (2 min 54 sec ago): SUCCESS: http://ci/job/princess/38784/</code></pre>
- </section>
- <section id="etsy_deploy4" >
- <p class="p" style="font-size:2.5em;text-align:left;">Deploy to Production:</p>
- <ul>
- <li style="font-size: 2em;">ssh to deploy host</li>
- <li style="font-size: 2em;">dsh to all targets</li>
- <li style="font-size: 2em;">rsync files</li>
- </ul>
- </section>
- <section id="etsy_deploy5" >
- <pre><code class="shell nohighlight" data-trim style="font-size:0.9em;" >Channel: #push Topic: <prod> bob Rasmus
-devbot: Swapping symlinks. Your code is about to start taking production traffic
-pushbot: bob Rasmus : Your code is live. Time to watch graphs: http://etsy/et5cp
-Jenkins: Starting build #39452 for job prod
-pushbot: bob Rasmus : prod tests have passed
-Jenkins: Project prod build #39452: SUCCESS in 30 sec: http://ci/job/prod/39452/
-bob: .good
-Rasmus: .good
-*** pushbot has changed the topic on #push to <prod> *bob *Rasmus
-pushbot: bob Rasmus : everyone is ready, checking on Jenkins...
-Jenkins: prod: last build: 39452 (1 min 39 sec ago): SUCCESS: http://ci/job/prod/39452/
-bob: .done
-pushbot: clear
-*** pushbot has changed the topic on #push to clear</code></pre>
- </section>
- <section id="etsy_deploy6" >
- <p class="p" style="font-size:2.5em;text-align:left;">Graph Everything!</p>
- <ul>
- <li style="font-size: 2em;">Statsd</li>
- <li style="font-size: 2em;">Grafana</li>
- </ul>
- </section>
- <section id="etsy_deploy7" >
- <p class="p" style="font-size:2.5em;text-align:left;">Log Everything!</p>
- <ul>
- <li style="font-size: 2em;">Supergrep</li>
- <li style="font-size: 2em;">Logstash</li>
- <li style="font-size: 2em;">Elastic Search</li>
- <li style="font-size: 2em;">mtail</li>
- <li style="font-size: 2em;">Prometheus</li>
- </ul>
- </section>
- <section id="etsy_deploy8" >
- <ul>
- <li style="font-size: 1.5em;">Commit to master</li>
- <li style="font-size: 1.5em;">Deploy from HEAD</li>
- <li style="font-size: 1.5em;">Branches?</li>
- <li style="font-size: 1.5em;">Branches are in code via feature flags</li>
- </ul>
- </section>
- <section id="etsy_deploy9" >
- <p class="p" style="font-size:2.2em;text-align:left;">Blameless post-mortems</p>
-<aside class="notes"><br />
-And when things go wrong...<br />
-</aside>
+ <section id="storage">
+
+<div id="storage_container" class="stretch" style="margin: 0 auto"></div>
+<script src="presentations/slides/intro/storage.js"></script>
</section> </section>
<section>
<section id="supported">
@@ -602,12 +495,6 @@ <h2 style="text-align:center;">Version Support</h2>
<div id="wpbench_container" class="stretch" style="margin: 0 auto"></div>
<script src="presentations/slides/intro/wp2021.js"></script>
</section> </section>
- <section>
- <section id="storage">
-
-<div id="storage_container" class="stretch" style="margin: 0 auto"></div>
-<script src="presentations/slides/intro/storage.js"></script>
- </section> </section>
<section>
<section id="php80">
<h1 style="text-align:center;">PHP 8.0</h1>
@@ -949,6 +836,7 @@ <h1 style="text-align:center;">PHP 8.1</h1>
<aside class="notes"><br />
Tridge arguing with Linus<br />
rsync, Samba, ccache, rzip<br />
+RIP BitKeeper<br />
</aside>
</section>
<section id="j4" >
diff --git a/etsymex21.xml b/etsymex21.xml
index 37af11bf..ea925f7b 100644
--- a/etsymex21.xml
+++ b/etsymex21.xml
@@ -29,10 +29,9 @@
<slide>slides/intro/phan_2019.xml</slide>
<slide>slides/intro/phpspy.xml</slide>
<slide>slides/intro/deploy_2016.xml</slide>
-<slide>slides/intro/etsy_deploy.xml</slide>
+<slide>slides/intro/storage.xml</slide>
<slide>slides/intro/supported.xml</slide>
<slide>slides/intro/wp2021.xml</slide>
-<slide>slides/intro/storage.xml</slide>
<slide>slides/intro/php80_2021.xml</slide>
<slide>slides/intro/php81_2021.xml</slide>
<slide>slides/intro/journey_etsy.xml</slide>
diff --git a/slides/intro/deploy_2016.xml b/slides/intro/deploy_2016.xml
index c0052a2a..c5110d87 100644
--- a/slides/intro/deploy_2016.xml
+++ b/slides/intro/deploy_2016.xml
@@ -4,8 +4,8 @@
<break lines="1" section="deploy0"/>
-<blurb fontsize="2em" align="left">Atomic</blurb>
-<blurb fontsize="2em" align="left">No performance hit</blurb>
+<blurb fontsize="1.7em" align="left">Atomic</blurb>
+<blurb fontsize="1.7em" align="left">No performance hit</blurb>
<list>
<bullet fontsize="1.5em">No restarts</bullet>
<bullet fontsize="1.5em">No LB removal</bullet>
@@ -14,32 +14,32 @@
</list>
<break lines="1" section="deploy1"/>
-<blurb fontsize="1.1em" align="left">Must be able to serve two versions of the site concurrently!</blurb>
+<blurb fontsize="1em" align="left">Must be able to serve two versions of the site concurrently!</blurb>
<image filename="atomic_deploy1.png" />
<break lines="1" section="deploy2"/>
<image filename="atomic_deploy2.png" />
<break lines="1" section="deploy3"/>
-<blurb fontsize="1.1em" align="left">Requests that begin on DocumentRoot A must finish on A</blurb>
+<blurb fontsize="1em" align="left">Requests that begin on DocumentRoot A must finish on A</blurb>
<break lines="1" section="deploy4"/>
-<blurb fontsize="1.1em" align="left">Set the DocumentRoot to symlink target!</blurb>
+<blurb fontsize="1em" align="left">Set the DocumentRoot to symlink target!</blurb>
-<blurb fontsize="1.1em" align="left">Easy with nginx</blurb>
+<blurb fontsize="1em" align="left">Easy with nginx</blurb>
<example fontsize="1.1em" result='0' title="" type="ini"><![CDATA[
fastcgi_param DOCUMENT_ROOT $realpath_root
]]></example>
-<blurb fontsize="1.1em" align="left">Apache</blurb>
+<blurb fontsize="1em" align="left">Apache</blurb>
<link fontsize="1.25em" align="left" marginleft="1em" href="https://github.com/etsy/mod_realdoc">github.com/etsy/mod_realdoc</link>
<break lines="1" section="deploy5"/>
-<blurb fontsize="1.1em" align="left">Avoid hardcoding full paths</blurb>
-<blurb fontsize="1.1em" align="left">Watch your include_path setting</blurb>
+<blurb fontsize="1em" align="left">Avoid hardcoding full paths</blurb>
+<blurb fontsize="1em" align="left">Watch your include_path setting</blurb>
-<blurb fontsize="1.1em" align="left">incpath extension can resolve your include_path for you</blurb>
+<blurb fontsize="1em" align="left">incpath extension can resolve your include_path for you</blurb>
<link fontsize="1.25em" align="left" marginleft="1em" href="https://github.com/etsy/incpath">https://github.com/etsy/incpath</link>
<notes>
@@ -47,7 +47,7 @@ some contraints...
</notes>
<break lines="1" section="deploy6"/>
-<blurb fontsize="1.1em" align="left">Version all static assets</blurb>
-<blurb fontsize="1.1em" align="left">DB Schema changes need special care</blurb>
+<blurb fontsize="1em" align="left">Version all static assets</blurb>
+<blurb fontsize="1em" align="left">DB Schema changes need special care</blurb>
</slide>
diff --git a/slides/intro/journey_etsy.xml b/slides/intro/journey_etsy.xml
index 69a64824..28e9a6a9 100644
--- a/slides/intro/journey_etsy.xml
+++ b/slides/intro/journey_etsy.xml
@@ -10,6 +10,7 @@
<notes>
Tridge arguing with Linus
rsync, Samba, ccache, rzip
+RIP BitKeeper
</notes>
<break lines="1" section="j4"/>
<image filename="roorkee.jpg" align="center"/>