| 1 |
diff --git a/.gitignore b/.gitignore |
| 2 |
new file mode 100644 |
| 3 |
index 0000000..f0cb01c |
| 4 |
--- /dev/null |
| 5 |
+++ b/.gitignore |
| 6 |
@@ -0,0 +1,3 @@ |
| 7 |
+ |
| 8 |
+/.pc/ |
| 9 |
+/_build/ |
| 10 |
diff --git a/google-guest-agent.service b/google-guest-agent.service |
| 11 |
index 79b8e39..23c506e 100644 |
| 12 |
--- a/google-guest-agent.service |
| 13 |
+++ b/google-guest-agent.service |
| 14 |
@@ -1,24 +1,14 @@ |
| 15 |
[Unit] |
| 16 |
Description=Google Compute Engine Guest Agent |
| 17 |
# Start before sshd in order to regenerate SSH host keys. |
| 18 |
-Before=sshd.service |
| 19 |
-# Start after network is online and restart when network service is restarted. |
| 20 |
-# Debian/Ubuntu 16.04: networking.service |
| 21 |
-# SLES/EL7: network.service (SLES via wicked.service) |
| 22 |
-# EL8: NetworkManager.service |
| 23 |
-# COS/Ubuntu 18.04+: systemd-networkd.service |
| 24 |
-After=network-online.target syslog.service |
| 25 |
-After=network.service networking.service NetworkManager.service systemd-networkd.service |
| 26 |
-Wants=network-online.target |
| 27 |
-PartOf=network.service networking.service NetworkManager.service systemd-networkd.service |
| 28 |
+Before=ssh.service |
| 29 |
+After=network-online.target |
| 30 |
|
| 31 |
[Service] |
| 32 |
Type=notify |
| 33 |
ExecStart=/usr/bin/google_guest_agent |
| 34 |
-OOMScoreAdjust=-999 |
| 35 |
+OOMScoreAdjust=-900 |
| 36 |
Restart=always |
| 37 |
|
| 38 |
[Install] |
| 39 |
-WantedBy=sshd.service |
| 40 |
WantedBy=multi-user.target |
| 41 |
-WantedBy=network.service networking.service NetworkManager.service systemd-networkd.service |
| 42 |
diff --git a/google-shutdown-scripts.service b/google-shutdown-scripts.service |
| 43 |
index 16bb9c2..29f8730 100644 |
| 44 |
--- a/google-shutdown-scripts.service |
| 45 |
+++ b/google-shutdown-scripts.service |
| 46 |
@@ -1,7 +1,6 @@ |
| 47 |
[Unit] |
| 48 |
Description=Google Compute Engine Shutdown Scripts |
| 49 |
-Wants=network-online.target rsyslog.service |
| 50 |
-After=network-online.target rsyslog.service |
| 51 |
+After=network-online.target google-guest-agent.service |
| 52 |
|
| 53 |
[Service] |
| 54 |
Type=oneshot |
| 55 |
@@ -9,7 +8,9 @@ ExecStart=/bin/true |
| 56 |
RemainAfterExit=true |
| 57 |
# This service does nothing on start, and runs shutdown scripts on stop. |
| 58 |
ExecStop=/usr/bin/google_metadata_script_runner shutdown |
| 59 |
-TimeoutStopSec=0 |
| 60 |
+# Shutdown needs to be finished in 90s |
| 61 |
+# https://cloud.google.com/compute/docs/instances/deleting-instance#delete_timeout |
| 62 |
+TimeoutStopSec=90s |
| 63 |
KillMode=process |
| 64 |
|
| 65 |
[Install] |
| 66 |
diff --git a/google-startup-scripts.service b/google-startup-scripts.service |
| 67 |
index dfc9838..3eb3355 100644 |
| 68 |
--- a/google-startup-scripts.service |
| 69 |
+++ b/google-startup-scripts.service |
| 70 |
@@ -1,13 +1,12 @@ |
| 71 |
[Unit] |
| 72 |
Description=Google Compute Engine Startup Scripts |
| 73 |
-Wants=network-online.target rsyslog.service |
| 74 |
-After=network-online.target rsyslog.service google-guest-agent.service |
| 75 |
+After=network-online.target google-guest-agent.service |
| 76 |
Before=apt-daily.service |
| 77 |
|
| 78 |
[Service] |
| 79 |
Type=oneshot |
| 80 |
ExecStart=/usr/bin/google_metadata_script_runner startup |
| 81 |
-#TimeoutStartSec is ignored for Type=oneshot service units. |
| 82 |
+RemainAfterExit=true |
| 83 |
KillMode=process |
| 84 |
|
| 85 |
[Install] |
| 86 |
diff --git a/google_guest_agent/wsfc_test.go b/google_guest_agent/wsfc_test.go |
| 87 |
deleted file mode 100644 |
| 88 |
index f5a9ae2..0000000 |
| 89 |
--- a/google_guest_agent/wsfc_test.go |
| 90 |
+++ /dev/null |
| 91 |
@@ -1,263 +0,0 @@ |
| 92 |
-// Copyright 2017 Google Inc. All Rights Reserved. |
| 93 |
-// |
| 94 |
-// Licensed under the Apache License, Version 2.0 (the "License"); |
| 95 |
-// you may not use this file except in compliance with the License. |
| 96 |
-// You may obtain a copy of the License at |
| 97 |
-// |
| 98 |
-// http://www.apache.org/licenses/LICENSE-2.0 |
| 99 |
-// |
| 100 |
-// Unless required by applicable law or agreed to in writing, software |
| 101 |
-// distributed under the License is distributed on an "AS IS" BASIS, |
| 102 |
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 103 |
-// See the License for the specific language governing permissions and |
| 104 |
-// limitations under the License. |
| 105 |
- |
| 106 |
-package main |
| 107 |
- |
| 108 |
-import ( |
| 109 |
- "bufio" |
| 110 |
- "errors" |
| 111 |
- "fmt" |
| 112 |
- "net" |
| 113 |
- "reflect" |
| 114 |
- "testing" |
| 115 |
- |
| 116 |
- "github.com/go-ini/ini" |
| 117 |
-) |
| 118 |
- |
| 119 |
-func setEnableWSFC(md metadata, enabled *bool) *metadata { |
| 120 |
- md.Instance.Attributes.EnableWSFC = enabled |
| 121 |
- return &md |
| 122 |
-} |
| 123 |
- |
| 124 |
-func setWSFCAddresses(md metadata, wsfcAddresses string) *metadata { |
| 125 |
- md.Instance.Attributes.WSFCAddresses = wsfcAddresses |
| 126 |
- return &md |
| 127 |
-} |
| 128 |
- |
| 129 |
-func setWSFCAgentPort(md metadata, wsfcPort string) *metadata { |
| 130 |
- md.Instance.Attributes.WSFCAgentPort = wsfcPort |
| 131 |
- return &md |
| 132 |
-} |
| 133 |
- |
| 134 |
-var ( |
| 135 |
- testAgent = getWsfcAgentInstance() |
| 136 |
- testMetadata = metadata{} |
| 137 |
- testListener = &net.TCPListener{} |
| 138 |
-) |
| 139 |
- |
| 140 |
-func TestNewWsfcManager(t *testing.T) { |
| 141 |
- type args struct { |
| 142 |
- newMetadata *metadata |
| 143 |
- } |
| 144 |
- tests := []struct { |
| 145 |
- name string |
| 146 |
- args args |
| 147 |
- want *wsfcManager |
| 148 |
- }{ |
| 149 |
- {"empty meta config", args{&testMetadata}, &wsfcManager{agentNewState: stopped, agentNewPort: wsfcDefaultAgentPort, agent: testAgent}}, |
| 150 |
- {"wsfc enabled", args{setEnableWSFC(testMetadata, mkptr(true))}, &wsfcManager{agentNewState: running, agentNewPort: wsfcDefaultAgentPort, agent: testAgent}}, |
| 151 |
- {"wsfc addrs is set", args{setWSFCAddresses(testMetadata, "0.0.0.0")}, &wsfcManager{agentNewState: running, agentNewPort: wsfcDefaultAgentPort, agent: testAgent}}, |
| 152 |
- {"wsfc port is set", args{setWSFCAgentPort(testMetadata, "1818")}, &wsfcManager{agentNewState: stopped, agentNewPort: "1818", agent: testAgent}}, |
| 153 |
- } |
| 154 |
- config = ini.Empty() |
| 155 |
- for _, tt := range tests { |
| 156 |
- newMetadata = tt.args.newMetadata |
| 157 |
- if got := newWsfcManager(); !reflect.DeepEqual(got, tt.want) { |
| 158 |
- t.Errorf("test case %q: newWsfcManager() = %v, want %v", tt.name, got, tt.want) |
| 159 |
- } |
| 160 |
- } |
| 161 |
-} |
| 162 |
- |
| 163 |
-func TestWsfcManagerDiff(t *testing.T) { |
| 164 |
- tests := []struct { |
| 165 |
- name string |
| 166 |
- m *wsfcManager |
| 167 |
- want bool |
| 168 |
- }{ |
| 169 |
- {"state change from stop to running", &wsfcManager{agentNewState: running, agent: &wsfcAgent{listener: nil}}, true}, |
| 170 |
- {"state change from running to stop", &wsfcManager{agentNewState: stopped, agent: &wsfcAgent{listener: testListener}}, true}, |
| 171 |
- {"port changed", &wsfcManager{agentNewPort: "1818", agent: &wsfcAgent{port: wsfcDefaultAgentPort}}, true}, |
| 172 |
- {"state does not change both running", &wsfcManager{agentNewState: running, agent: &wsfcAgent{listener: testListener}}, false}, |
| 173 |
- {"state does not change both stopped", &wsfcManager{agentNewState: stopped, agent: &wsfcAgent{listener: nil}}, false}, |
| 174 |
- } |
| 175 |
- for _, tt := range tests { |
| 176 |
- if got := tt.m.diff(); got != tt.want { |
| 177 |
- t.Errorf("test case %q: wsfcManager.diff() = %v, want %v", tt.name, got, tt.want) |
| 178 |
- } |
| 179 |
- |
| 180 |
- } |
| 181 |
-} |
| 182 |
- |
| 183 |
-// Mock health agent for unit testing |
| 184 |
-type mockAgent struct { |
| 185 |
- state agentState |
| 186 |
- port string |
| 187 |
- runError bool |
| 188 |
- stopError bool |
| 189 |
- runInvoked bool |
| 190 |
- stopInvoked bool |
| 191 |
-} |
| 192 |
- |
| 193 |
-func (a *mockAgent) getState() agentState { |
| 194 |
- return a.state |
| 195 |
-} |
| 196 |
- |
| 197 |
-func (a *mockAgent) getPort() string { |
| 198 |
- return a.port |
| 199 |
-} |
| 200 |
- |
| 201 |
-func (a *mockAgent) setPort(newPort string) { |
| 202 |
- a.port = newPort |
| 203 |
-} |
| 204 |
- |
| 205 |
-func (a *mockAgent) run() error { |
| 206 |
- a.runInvoked = true |
| 207 |
- if a.runError { |
| 208 |
- return errors.New("Run error") |
| 209 |
- } |
| 210 |
- |
| 211 |
- a.state = running |
| 212 |
- return nil |
| 213 |
-} |
| 214 |
- |
| 215 |
-func (a *mockAgent) stop() error { |
| 216 |
- a.stopInvoked = true |
| 217 |
- if a.stopError { |
| 218 |
- return errors.New("Stop error") |
| 219 |
- } |
| 220 |
- |
| 221 |
- a.state = stopped |
| 222 |
- return nil |
| 223 |
-} |
| 224 |
- |
| 225 |
-func TestWsfcManagerSet(t *testing.T) { |
| 226 |
- tests := []struct { |
| 227 |
- name string |
| 228 |
- m *wsfcManager |
| 229 |
- wantErr bool |
| 230 |
- runInvoked bool |
| 231 |
- stopInvoked bool |
| 232 |
- }{ |
| 233 |
- {"set start agent", &wsfcManager{agentNewState: running, agent: &mockAgent{state: stopped}}, false, true, false}, |
| 234 |
- {"set start agent error", &wsfcManager{agentNewState: running, agent: &mockAgent{state: stopped, runError: true}}, true, true, false}, |
| 235 |
- {"set stop agent", &wsfcManager{agentNewState: stopped, agent: &mockAgent{state: running}}, false, false, true}, |
| 236 |
- {"set stop agent error", &wsfcManager{agentNewState: stopped, agent: &mockAgent{state: running, stopError: true}}, true, false, true}, |
| 237 |
- {"set restart agent", &wsfcManager{agentNewState: running, agentNewPort: "1", agent: &mockAgent{state: running, port: "0"}}, false, true, true}, |
| 238 |
- {"set restart agent stop error", &wsfcManager{agentNewState: running, agentNewPort: "1", agent: &mockAgent{state: running, port: "0", stopError: true}}, true, false, true}, |
| 239 |
- {"set restart agent start error", &wsfcManager{agentNewState: running, agentNewPort: "1", agent: &mockAgent{state: running, port: "0", runError: true}}, true, true, true}, |
| 240 |
- {"set do nothing", &wsfcManager{agentNewState: stopped, agentNewPort: "1", agent: &mockAgent{state: stopped, port: "0"}}, false, false, false}, |
| 241 |
- } |
| 242 |
- for _, tt := range tests { |
| 243 |
- if err := tt.m.set(); (err != nil) != tt.wantErr { |
| 244 |
- t.Errorf("wsfcManager.set() error = %v, wantErr %v", err, tt.wantErr) |
| 245 |
- } |
| 246 |
- |
| 247 |
- mAgent := tt.m.agent.(*mockAgent) |
| 248 |
- if gotRunInvoked := mAgent.runInvoked; gotRunInvoked != tt.runInvoked { |
| 249 |
- t.Errorf("wsfcManager.set() runInvoked = %v, want %v", gotRunInvoked, tt.runInvoked) |
| 250 |
- } |
| 251 |
- |
| 252 |
- if gotStopInvoked := mAgent.stopInvoked; gotStopInvoked != tt.stopInvoked { |
| 253 |
- t.Errorf("wsfcManager.set() stopInvoked = %v, want %v", gotStopInvoked, tt.stopInvoked) |
| 254 |
- } |
| 255 |
- |
| 256 |
- if tt.m.agentNewPort != mAgent.port { |
| 257 |
- t.Errorf("wsfcManager.set() does not set prot, agent port = %v, want %v", mAgent.port, tt.m.agentNewPort) |
| 258 |
- } |
| 259 |
- } |
| 260 |
-} |
| 261 |
- |
| 262 |
-func getHealthCheckResponce(request string, agent healthAgent) (string, error) { |
| 263 |
- serverAddr := "localhost:" + agent.getPort() |
| 264 |
- conn, err := net.Dial("tcp", serverAddr) |
| 265 |
- if err != nil { |
| 266 |
- return "", err |
| 267 |
- } |
| 268 |
- defer closer(conn) |
| 269 |
- |
| 270 |
- fmt.Fprint(conn, request) |
| 271 |
- return bufio.NewReader(conn).ReadString('\n') |
| 272 |
-} |
| 273 |
- |
| 274 |
-func TestWsfcRunAgentE2E(t *testing.T) { |
| 275 |
- |
| 276 |
- wsfcMgr := &wsfcManager{agentNewState: running, agentNewPort: wsfcDefaultAgentPort, agent: getWsfcAgentInstance()} |
| 277 |
- wsfcMgr.set() |
| 278 |
- |
| 279 |
- // make sure the agent is cleaned up. |
| 280 |
- defer wsfcMgr.agent.stop() |
| 281 |
- |
| 282 |
- addrs, err := net.InterfaceAddrs() |
| 283 |
- if err != nil { |
| 284 |
- t.Fatal("getting localing interface failed.") |
| 285 |
- } |
| 286 |
- |
| 287 |
- // pick first local ip that is not lookback ip |
| 288 |
- var existIP string |
| 289 |
- for _, addr := range addrs { |
| 290 |
- if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() { |
| 291 |
- existIP = ipnet.IP.To4().String() |
| 292 |
- break |
| 293 |
- } |
| 294 |
- } |
| 295 |
- |
| 296 |
- // test with existing IP |
| 297 |
- if got, err := getHealthCheckResponce(existIP, wsfcMgr.agent); got != "1" { |
| 298 |
- t.Errorf("health check failed with %v, got = %v, want %v", existIP, got, "1") |
| 299 |
- if err != nil { |
| 300 |
- t.Error(err) |
| 301 |
- } |
| 302 |
- } |
| 303 |
- |
| 304 |
- // test an invalid ip which could not exist |
| 305 |
- invalidIP := "255.255.255.256" |
| 306 |
- if got, err := getHealthCheckResponce(invalidIP, wsfcMgr.agent); got != "0" { |
| 307 |
- t.Errorf("health check failed with %v, got = %v, want %v", invalidIP, got, "0") |
| 308 |
- if err != nil { |
| 309 |
- t.Error(err) |
| 310 |
- } |
| 311 |
- } |
| 312 |
- |
| 313 |
- // test stop agent |
| 314 |
- wsfcMgrStop := &wsfcManager{agentNewState: stopped, agent: getWsfcAgentInstance()} |
| 315 |
- wsfcMgrStop.set() |
| 316 |
- if _, err := getHealthCheckResponce(existIP, wsfcMgr.agent); err == nil { |
| 317 |
- t.Errorf("health check still running after calling stop") |
| 318 |
- } |
| 319 |
-} |
| 320 |
- |
| 321 |
-func TestInvokeRunOnRunningWsfcAgent(t *testing.T) { |
| 322 |
- agent := &wsfcAgent{listener: testListener} |
| 323 |
- |
| 324 |
- if err := agent.run(); err != nil { |
| 325 |
- t.Errorf("Invoke run on running agent, error = %v, want = %v", err, nil) |
| 326 |
- } |
| 327 |
-} |
| 328 |
- |
| 329 |
-func TestInvokeStopOnStoppedWsfcAgent(t *testing.T) { |
| 330 |
- agent := &wsfcAgent{listener: nil} |
| 331 |
- |
| 332 |
- if err := agent.stop(); err != nil { |
| 333 |
- t.Errorf("Invoke stop on stopped agent, error = %v, want = %v", err, nil) |
| 334 |
- } |
| 335 |
-} |
| 336 |
- |
| 337 |
-func TestWsfcAgentSetPort(t *testing.T) { |
| 338 |
- want := "2" |
| 339 |
- agent := &wsfcAgent{port: "1"} |
| 340 |
- agent.setPort(want) |
| 341 |
- |
| 342 |
- if agent.port != want { |
| 343 |
- t.Errorf("WsfcAgent.setPort() port = %v, want %v", agent.port, want) |
| 344 |
- } |
| 345 |
-} |
| 346 |
- |
| 347 |
-func TestGetWsfcAgentInstance(t *testing.T) { |
| 348 |
- agentFirst := getWsfcAgentInstance() |
| 349 |
- agentSecond := getWsfcAgentInstance() |
| 350 |
- |
| 351 |
- if agentFirst != agentSecond { |
| 352 |
- t.Errorf("getWsfcAgentInstance is not returning same instance") |
| 353 |
- } |
| 354 |
-} |
| 355 |
diff --git a/instance_configs.cfg b/instance_configs.cfg |
| 356 |
index b515cf8..3005173 100644 |
| 357 |
--- a/instance_configs.cfg |
| 358 |
+++ b/instance_configs.cfg |
| 359 |
@@ -15,10 +15,10 @@ network_daemon = true |
| 360 |
[InstanceSetup] |
| 361 |
host_key_types = ecdsa,ed25519,rsa |
| 362 |
network_enabled = true |
| 363 |
-optimize_local_ssd = true |
| 364 |
+optimize_local_ssd = false |
| 365 |
set_boto_config = true |
| 366 |
set_host_keys = true |
| 367 |
-set_multiqueue = true |
| 368 |
+set_multiqueue = false |
| 369 |
|
| 370 |
[IpForwarding] |
| 371 |
ethernet_proto_id = 66 |