conflict_test.go 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536
  1. // Copyright (C) 2015 The Syncthing Authors.
  2. //
  3. // This Source Code Form is subject to the terms of the Mozilla Public
  4. // License, v. 2.0. If a copy of the MPL was not distributed with this file,
  5. // You can obtain one at https://mozilla.org/MPL/2.0/.
  6. //go:build integration
  7. // +build integration
  8. package integration
  9. import (
  10. "bytes"
  11. "io/ioutil"
  12. "log"
  13. "os"
  14. "path/filepath"
  15. "testing"
  16. "time"
  17. "github.com/syncthing/syncthing/lib/rc"
  18. )
  19. func TestConflictsDefault(t *testing.T) {
  20. log.Println("Cleaning...")
  21. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  22. if err != nil {
  23. t.Fatal(err)
  24. }
  25. log.Println("Generating files...")
  26. err = generateFiles("s1", 100, 20, "../LICENSE")
  27. if err != nil {
  28. t.Fatal(err)
  29. }
  30. fd, err := os.Create("s1/testfile.txt")
  31. if err != nil {
  32. t.Fatal(err)
  33. }
  34. _, err = fd.WriteString("hello\n")
  35. if err != nil {
  36. t.Fatal(err)
  37. }
  38. err = fd.Close()
  39. if err != nil {
  40. t.Fatal(err)
  41. }
  42. expected, err := directoryContents("s1")
  43. if err != nil {
  44. t.Fatal(err)
  45. }
  46. sender := startInstance(t, 1)
  47. defer checkedStop(t, sender)
  48. receiver := startInstance(t, 2)
  49. defer checkedStop(t, receiver)
  50. sender.ResumeAll()
  51. receiver.ResumeAll()
  52. // Rescan with a delay on the next one, so we are not surprised by a
  53. // sudden rescan while we're trying to introduce conflicts.
  54. if err := sender.RescanDelay("default", 86400); err != nil {
  55. t.Fatal(err)
  56. }
  57. if err := receiver.RescanDelay("default", 86400); err != nil {
  58. t.Fatal(err)
  59. }
  60. rc.AwaitSync("default", sender, receiver)
  61. log.Println("Verifying...")
  62. actual, err := directoryContents("s2")
  63. if err != nil {
  64. t.Fatal(err)
  65. }
  66. err = compareDirectoryContents(actual, expected)
  67. if err != nil {
  68. t.Fatal(err)
  69. }
  70. log.Println("Introducing a conflict (simultaneous edit)...")
  71. if err := sender.PauseDevice(receiver.ID()); err != nil {
  72. t.Fatal(err)
  73. }
  74. fd, err = os.OpenFile("s1/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
  75. if err != nil {
  76. t.Fatal(err)
  77. }
  78. _, err = fd.WriteString("text added to s1\n")
  79. if err != nil {
  80. t.Fatal(err)
  81. }
  82. err = fd.Close()
  83. if err != nil {
  84. t.Fatal(err)
  85. }
  86. fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
  87. if err != nil {
  88. t.Fatal(err)
  89. }
  90. _, err = fd.WriteString("text added to s2\n")
  91. if err != nil {
  92. t.Fatal(err)
  93. }
  94. err = fd.Close()
  95. if err != nil {
  96. t.Fatal(err)
  97. }
  98. if err := sender.ResumeDevice(receiver.ID()); err != nil {
  99. t.Fatal(err)
  100. }
  101. log.Println("Syncing...")
  102. if err := sender.RescanDelay("default", 86400); err != nil {
  103. t.Fatal(err)
  104. }
  105. if err := receiver.RescanDelay("default", 86400); err != nil {
  106. t.Fatal(err)
  107. }
  108. rc.AwaitSync("default", sender, receiver)
  109. // Expect one conflict file, created on either side.
  110. files, err := filepath.Glob("s?/*sync-conflict*")
  111. if err != nil {
  112. t.Fatal(err)
  113. }
  114. if len(files) != 2 {
  115. t.Errorf("Expected 1 conflicted file on each side, instead of totally %d", len(files))
  116. } else if filepath.Base(files[0]) != filepath.Base(files[1]) {
  117. t.Errorf(`Expected same conflicted file on both sides, got "%v" and "%v"`, files[0], files[1])
  118. }
  119. log.Println("Introducing a conflict (edit plus delete)...")
  120. if err := sender.PauseDevice(receiver.ID()); err != nil {
  121. t.Fatal(err)
  122. }
  123. err = os.Remove("s1/testfile.txt")
  124. if err != nil {
  125. t.Fatal(err)
  126. }
  127. fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
  128. if err != nil {
  129. t.Fatal(err)
  130. }
  131. _, err = fd.WriteString("more text added to s2\n")
  132. if err != nil {
  133. t.Fatal(err)
  134. }
  135. err = fd.Close()
  136. if err != nil {
  137. t.Fatal(err)
  138. }
  139. if err := sender.ResumeDevice(receiver.ID()); err != nil {
  140. t.Fatal(err)
  141. }
  142. log.Println("Syncing...")
  143. if err := sender.RescanDelay("default", 86400); err != nil {
  144. t.Fatal(err)
  145. }
  146. if err := receiver.RescanDelay("default", 86400); err != nil {
  147. t.Fatal(err)
  148. }
  149. rc.AwaitSync("default", sender, receiver)
  150. // The conflict is resolved to the advantage of the edit over the delete.
  151. // As such, we get the edited content synced back to s1 where it was
  152. // removed.
  153. files, err = filepath.Glob("s2/*sync-conflict*")
  154. if err != nil {
  155. t.Fatal(err)
  156. }
  157. if len(files) != 1 {
  158. t.Errorf("Expected 1 conflicted files instead of %d", len(files))
  159. }
  160. bs, err := ioutil.ReadFile("s1/testfile.txt")
  161. if err != nil {
  162. t.Error("reading file:", err)
  163. }
  164. if !bytes.Contains(bs, []byte("more text added to s2")) {
  165. t.Error("s1/testfile.txt should contain data added in s2")
  166. }
  167. }
  168. func TestConflictsInitialMerge(t *testing.T) {
  169. log.Println("Cleaning...")
  170. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  171. if err != nil {
  172. t.Fatal(err)
  173. }
  174. err = os.Mkdir("s1", 0755)
  175. if err != nil {
  176. t.Fatal(err)
  177. }
  178. err = os.Mkdir("s2", 0755)
  179. if err != nil {
  180. t.Fatal(err)
  181. }
  182. // File 1 is a conflict
  183. err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
  184. if err != nil {
  185. t.Fatal(err)
  186. }
  187. err = ioutil.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
  188. if err != nil {
  189. t.Fatal(err)
  190. }
  191. // File 2 exists on s1 only
  192. err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
  193. if err != nil {
  194. t.Fatal(err)
  195. }
  196. // File 3 exists on s2 only
  197. err = ioutil.WriteFile("s2/file3", []byte("goodbye\n"), 0644)
  198. if err != nil {
  199. t.Fatal(err)
  200. }
  201. // Let them sync
  202. sender := startInstance(t, 1)
  203. defer checkedStop(t, sender)
  204. receiver := startInstance(t, 2)
  205. defer checkedStop(t, receiver)
  206. sender.ResumeAll()
  207. receiver.ResumeAll()
  208. log.Println("Syncing...")
  209. rc.AwaitSync("default", sender, receiver)
  210. // Do it once more so the conflict copies propagate to both sides.
  211. sender.Rescan("default")
  212. receiver.Rescan("default")
  213. rc.AwaitSync("default", sender, receiver)
  214. checkedStop(t, sender)
  215. checkedStop(t, receiver)
  216. log.Println("Verifying...")
  217. // s1 should have four files (there's a conflict)
  218. files, err := filepath.Glob("s1/file*")
  219. if err != nil {
  220. t.Fatal(err)
  221. }
  222. if len(files) != 4 {
  223. t.Errorf("Expected 4 files in s1 instead of %d", len(files))
  224. }
  225. // s2 should have four files (there's a conflict)
  226. files, err = filepath.Glob("s2/file*")
  227. if err != nil {
  228. t.Fatal(err)
  229. }
  230. if len(files) != 4 {
  231. t.Errorf("Expected 4 files in s2 instead of %d", len(files))
  232. }
  233. // file1 is in conflict, so there's two versions of that one
  234. files, err = filepath.Glob("s2/file1*")
  235. if err != nil {
  236. t.Fatal(err)
  237. }
  238. if len(files) != 2 {
  239. t.Errorf("Expected 2 'file1' files in s2 instead of %d", len(files))
  240. }
  241. }
  242. func TestConflictsIndexReset(t *testing.T) {
  243. log.Println("Cleaning...")
  244. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  245. if err != nil {
  246. t.Fatal(err)
  247. }
  248. err = os.Mkdir("s1", 0755)
  249. if err != nil {
  250. t.Fatal(err)
  251. }
  252. err = os.Mkdir("s2", 0755)
  253. if err != nil {
  254. t.Fatal(err)
  255. }
  256. // Three files on s1
  257. err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
  258. if err != nil {
  259. t.Fatal(err)
  260. }
  261. err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
  262. if err != nil {
  263. t.Fatal(err)
  264. }
  265. err = ioutil.WriteFile("s2/file3", []byte("hello\n"), 0644)
  266. if err != nil {
  267. t.Fatal(err)
  268. }
  269. // Let them sync
  270. sender := startInstance(t, 1)
  271. defer checkedStop(t, sender)
  272. receiver := startInstance(t, 2)
  273. defer checkedStop(t, receiver)
  274. sender.ResumeAll()
  275. receiver.ResumeAll()
  276. log.Println("Syncing...")
  277. rc.AwaitSync("default", sender, receiver)
  278. log.Println("Verifying...")
  279. // s1 should have three files
  280. files, err := filepath.Glob("s1/file*")
  281. if err != nil {
  282. t.Fatal(err)
  283. }
  284. if len(files) != 3 {
  285. t.Errorf("Expected 3 files in s1 instead of %d", len(files))
  286. }
  287. // s2 should have three files
  288. files, err = filepath.Glob("s2/file*")
  289. if err != nil {
  290. t.Fatal(err)
  291. }
  292. if len(files) != 3 {
  293. t.Errorf("Expected 3 files in s2 instead of %d", len(files))
  294. }
  295. log.Println("Updating...")
  296. // change s2/file2 a few times, so that its version counter increases.
  297. // This will make the file on the cluster look newer than what we have
  298. // locally after we rest the index, unless we have a fix for that.
  299. for i := 0; i < 5; i++ {
  300. err = ioutil.WriteFile("s2/file2", []byte("hello1\n"), 0644)
  301. if err != nil {
  302. t.Fatal(err)
  303. }
  304. err = receiver.Rescan("default")
  305. if err != nil {
  306. t.Fatal(err)
  307. }
  308. time.Sleep(time.Second)
  309. }
  310. rc.AwaitSync("default", sender, receiver)
  311. // Now nuke the index
  312. log.Println("Resetting...")
  313. checkedStop(t, receiver)
  314. removeAll("h2/index*")
  315. // s1/file1 (remote) changes while receiver is down
  316. err = ioutil.WriteFile("s1/file1", []byte("goodbye\n"), 0644)
  317. if err != nil {
  318. t.Fatal(err)
  319. }
  320. // s1 must know about it
  321. err = sender.Rescan("default")
  322. if err != nil {
  323. t.Fatal(err)
  324. }
  325. // s2/file2 (local) changes while receiver is down
  326. err = ioutil.WriteFile("s2/file2", []byte("goodbye\n"), 0644)
  327. if err != nil {
  328. t.Fatal(err)
  329. }
  330. receiver = startInstance(t, 2)
  331. defer checkedStop(t, receiver)
  332. receiver.ResumeAll()
  333. log.Println("Syncing...")
  334. rc.AwaitSync("default", sender, receiver)
  335. // s2 should have five files (three plus two conflicts)
  336. files, err = filepath.Glob("s2/file*")
  337. if err != nil {
  338. t.Fatal(err)
  339. }
  340. if len(files) != 5 {
  341. t.Errorf("Expected 5 files in s2 instead of %d", len(files))
  342. }
  343. // file1 is in conflict, so there's two versions of that one
  344. files, err = filepath.Glob("s2/file1*")
  345. if err != nil {
  346. t.Fatal(err)
  347. }
  348. if len(files) != 2 {
  349. t.Errorf("Expected 2 'file1' files in s2 instead of %d", len(files))
  350. }
  351. // file2 is in conflict, so there's two versions of that one
  352. files, err = filepath.Glob("s2/file2*")
  353. if err != nil {
  354. t.Fatal(err)
  355. }
  356. if len(files) != 2 {
  357. t.Errorf("Expected 2 'file2' files in s2 instead of %d", len(files))
  358. }
  359. }
  360. func TestConflictsSameContent(t *testing.T) {
  361. log.Println("Cleaning...")
  362. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  363. if err != nil {
  364. t.Fatal(err)
  365. }
  366. err = os.Mkdir("s1", 0755)
  367. if err != nil {
  368. t.Fatal(err)
  369. }
  370. err = os.Mkdir("s2", 0755)
  371. if err != nil {
  372. t.Fatal(err)
  373. }
  374. // Two files on s1
  375. err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
  376. if err != nil {
  377. t.Fatal(err)
  378. }
  379. err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
  380. if err != nil {
  381. t.Fatal(err)
  382. }
  383. // Two files on s2, content differs in file1 only, timestamps differ on both.
  384. err = ioutil.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
  385. if err != nil {
  386. t.Fatal(err)
  387. }
  388. err = ioutil.WriteFile("s2/file2", []byte("hello\n"), 0644)
  389. if err != nil {
  390. t.Fatal(err)
  391. }
  392. ts := time.Now().Add(-time.Hour)
  393. os.Chtimes("s2/file1", ts, ts)
  394. os.Chtimes("s2/file2", ts, ts)
  395. // Let them sync
  396. sender := startInstance(t, 1)
  397. defer checkedStop(t, sender)
  398. receiver := startInstance(t, 2)
  399. defer checkedStop(t, receiver)
  400. sender.ResumeAll()
  401. receiver.ResumeAll()
  402. log.Println("Syncing...")
  403. rc.AwaitSync("default", sender, receiver)
  404. // Let conflict copies propagate
  405. sender.Rescan("default")
  406. receiver.Rescan("default")
  407. rc.AwaitSync("default", sender, receiver)
  408. log.Println("Verifying...")
  409. // s1 should have three files
  410. files, err := filepath.Glob("s1/file*")
  411. if err != nil {
  412. t.Fatal(err)
  413. }
  414. if len(files) != 3 {
  415. t.Errorf("Expected 3 files in s1 instead of %d", len(files))
  416. }
  417. // s2 should have three files
  418. files, err = filepath.Glob("s2/file*")
  419. if err != nil {
  420. t.Fatal(err)
  421. }
  422. if len(files) != 3 {
  423. t.Errorf("Expected 3 files in s2 instead of %d", len(files))
  424. }
  425. }