conflict_test.go 8.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432
  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 http://mozilla.org/MPL/2.0/.
  6. // +build integration
  7. package integration
  8. import (
  9. "bytes"
  10. "io/ioutil"
  11. "log"
  12. "os"
  13. "testing"
  14. "time"
  15. "github.com/syncthing/syncthing/lib/osutil"
  16. "github.com/syncthing/syncthing/lib/rc"
  17. )
  18. func TestConflictsDefault(t *testing.T) {
  19. log.Println("Cleaning...")
  20. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  21. if err != nil {
  22. t.Fatal(err)
  23. }
  24. log.Println("Generating files...")
  25. err = generateFiles("s1", 100, 20, "../LICENSE")
  26. if err != nil {
  27. t.Fatal(err)
  28. }
  29. fd, err := os.Create("s1/testfile.txt")
  30. if err != nil {
  31. t.Fatal(err)
  32. }
  33. _, err = fd.WriteString("hello\n")
  34. if err != nil {
  35. t.Fatal(err)
  36. }
  37. err = fd.Close()
  38. if err != nil {
  39. t.Fatal(err)
  40. }
  41. expected, err := directoryContents("s1")
  42. if err != nil {
  43. t.Fatal(err)
  44. }
  45. sender := startInstance(t, 1)
  46. defer checkedStop(t, sender)
  47. receiver := startInstance(t, 2)
  48. defer checkedStop(t, receiver)
  49. // Rescan with a delay on the next one, so we are not surprised by a
  50. // sudden rescan while we're trying to introduce conflicts.
  51. if err := sender.RescanDelay("default", 86400); err != nil {
  52. t.Fatal(err)
  53. }
  54. if err := receiver.RescanDelay("default", 86400); err != nil {
  55. t.Fatal(err)
  56. }
  57. rc.AwaitSync("default", sender, receiver)
  58. log.Println("Verifying...")
  59. actual, err := directoryContents("s2")
  60. if err != nil {
  61. t.Fatal(err)
  62. }
  63. err = compareDirectoryContents(actual, expected)
  64. if err != nil {
  65. t.Fatal(err)
  66. }
  67. log.Println("Introducing a conflict (simultaneous edit)...")
  68. if err := sender.PauseDevice(receiver.ID()); err != nil {
  69. t.Fatal(err)
  70. }
  71. fd, err = os.OpenFile("s1/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
  72. if err != nil {
  73. t.Fatal(err)
  74. }
  75. _, err = fd.WriteString("text added to s1\n")
  76. if err != nil {
  77. t.Fatal(err)
  78. }
  79. err = fd.Close()
  80. if err != nil {
  81. t.Fatal(err)
  82. }
  83. fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
  84. if err != nil {
  85. t.Fatal(err)
  86. }
  87. _, err = fd.WriteString("text added to s2\n")
  88. if err != nil {
  89. t.Fatal(err)
  90. }
  91. err = fd.Close()
  92. if err != nil {
  93. t.Fatal(err)
  94. }
  95. if err := sender.ResumeDevice(receiver.ID()); err != nil {
  96. t.Fatal(err)
  97. }
  98. log.Println("Syncing...")
  99. if err := sender.RescanDelay("default", 86400); err != nil {
  100. t.Fatal(err)
  101. }
  102. if err := receiver.RescanDelay("default", 86400); err != nil {
  103. t.Fatal(err)
  104. }
  105. rc.AwaitSync("default", sender, receiver)
  106. // The conflict is expected on the s2 side due to how we calculate which
  107. // file is the winner (based on device ID)
  108. files, err := osutil.Glob("s2/*sync-conflict*")
  109. if err != nil {
  110. t.Fatal(err)
  111. }
  112. if len(files) != 1 {
  113. t.Errorf("Expected 1 conflicted files instead of %d", len(files))
  114. }
  115. log.Println("Introducing a conflict (edit plus delete)...")
  116. if err := sender.PauseDevice(receiver.ID()); err != nil {
  117. t.Fatal(err)
  118. }
  119. err = os.Remove("s1/testfile.txt")
  120. if err != nil {
  121. t.Fatal(err)
  122. }
  123. fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
  124. if err != nil {
  125. t.Fatal(err)
  126. }
  127. _, err = fd.WriteString("more text added to s2\n")
  128. if err != nil {
  129. t.Fatal(err)
  130. }
  131. err = fd.Close()
  132. if err != nil {
  133. t.Fatal(err)
  134. }
  135. if err := sender.ResumeDevice(receiver.ID()); err != nil {
  136. t.Fatal(err)
  137. }
  138. log.Println("Syncing...")
  139. if err := sender.RescanDelay("default", 86400); err != nil {
  140. t.Fatal(err)
  141. }
  142. if err := receiver.RescanDelay("default", 86400); err != nil {
  143. t.Fatal(err)
  144. }
  145. rc.AwaitSync("default", sender, receiver)
  146. // The conflict is resolved to the advantage of the edit over the delete.
  147. // As such, we get the edited content synced back to s1 where it was
  148. // removed.
  149. files, err = osutil.Glob("s2/*sync-conflict*")
  150. if err != nil {
  151. t.Fatal(err)
  152. }
  153. if len(files) != 1 {
  154. t.Errorf("Expected 1 conflicted files instead of %d", len(files))
  155. }
  156. bs, err := ioutil.ReadFile("s1/testfile.txt")
  157. if err != nil {
  158. t.Error("reading file:", err)
  159. }
  160. if !bytes.Contains(bs, []byte("more text added to s2")) {
  161. t.Error("s1/testfile.txt should contain data added in s2")
  162. }
  163. }
  164. func TestConflictsInitialMerge(t *testing.T) {
  165. log.Println("Cleaning...")
  166. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  167. if err != nil {
  168. t.Fatal(err)
  169. }
  170. err = os.Mkdir("s1", 0755)
  171. if err != nil {
  172. t.Fatal(err)
  173. }
  174. err = os.Mkdir("s2", 0755)
  175. if err != nil {
  176. t.Fatal(err)
  177. }
  178. // File 1 is a conflict
  179. err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
  180. if err != nil {
  181. t.Fatal(err)
  182. }
  183. err = ioutil.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
  184. if err != nil {
  185. t.Fatal(err)
  186. }
  187. // File 2 exists on s1 only
  188. err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
  189. if err != nil {
  190. t.Fatal(err)
  191. }
  192. // File 3 exists on s2 only
  193. err = ioutil.WriteFile("s2/file3", []byte("goodbye\n"), 0644)
  194. if err != nil {
  195. t.Fatal(err)
  196. }
  197. // Let them sync
  198. sender := startInstance(t, 1)
  199. defer checkedStop(t, sender)
  200. receiver := startInstance(t, 2)
  201. defer checkedStop(t, receiver)
  202. log.Println("Syncing...")
  203. rc.AwaitSync("default", sender, receiver)
  204. checkedStop(t, sender)
  205. checkedStop(t, receiver)
  206. log.Println("Verifying...")
  207. // s1 should have three-four files (there's a conflict from s2 which may or may not have synced yet)
  208. files, err := osutil.Glob("s1/file*")
  209. if err != nil {
  210. t.Fatal(err)
  211. }
  212. if len(files) < 3 || len(files) > 4 {
  213. t.Errorf("Expected 3-4 files in s1 instead of %d", len(files))
  214. }
  215. // s2 should have four files (there's a conflict)
  216. files, err = osutil.Glob("s2/file*")
  217. if err != nil {
  218. t.Fatal(err)
  219. }
  220. if len(files) != 4 {
  221. t.Errorf("Expected 4 files in s2 instead of %d", len(files))
  222. }
  223. // file1 is in conflict, so there's two versions of that one
  224. files, err = osutil.Glob("s2/file1*")
  225. if err != nil {
  226. t.Fatal(err)
  227. }
  228. if len(files) != 2 {
  229. t.Errorf("Expected 2 'file1' files in s2 instead of %d", len(files))
  230. }
  231. }
  232. func TestConflictsIndexReset(t *testing.T) {
  233. log.Println("Cleaning...")
  234. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  235. if err != nil {
  236. t.Fatal(err)
  237. }
  238. err = os.Mkdir("s1", 0755)
  239. if err != nil {
  240. t.Fatal(err)
  241. }
  242. err = os.Mkdir("s2", 0755)
  243. if err != nil {
  244. t.Fatal(err)
  245. }
  246. // Three files on s1
  247. err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
  248. if err != nil {
  249. t.Fatal(err)
  250. }
  251. err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
  252. if err != nil {
  253. t.Fatal(err)
  254. }
  255. err = ioutil.WriteFile("s2/file3", []byte("hello\n"), 0644)
  256. if err != nil {
  257. t.Fatal(err)
  258. }
  259. // Let them sync
  260. sender := startInstance(t, 1)
  261. defer checkedStop(t, sender)
  262. receiver := startInstance(t, 2)
  263. defer checkedStop(t, receiver)
  264. log.Println("Syncing...")
  265. rc.AwaitSync("default", sender, receiver)
  266. log.Println("Verifying...")
  267. // s1 should have three files
  268. files, err := osutil.Glob("s1/file*")
  269. if err != nil {
  270. t.Fatal(err)
  271. }
  272. if len(files) != 3 {
  273. t.Errorf("Expected 3 files in s1 instead of %d", len(files))
  274. }
  275. // s2 should have three
  276. files, err = osutil.Glob("s2/file*")
  277. if err != nil {
  278. t.Fatal(err)
  279. }
  280. if len(files) != 3 {
  281. t.Errorf("Expected 3 files in s2 instead of %d", len(files))
  282. }
  283. log.Println("Updating...")
  284. // change s2/file2 a few times, so that it's version counter increases.
  285. // This will make the file on the cluster look newer than what we have
  286. // locally after we rest the index, unless we have a fix for that.
  287. for i := 0; i < 5; i++ {
  288. err = ioutil.WriteFile("s2/file2", []byte("hello1\n"), 0644)
  289. if err != nil {
  290. t.Fatal(err)
  291. }
  292. err = receiver.Rescan("default")
  293. if err != nil {
  294. t.Fatal(err)
  295. }
  296. time.Sleep(time.Second)
  297. }
  298. rc.AwaitSync("default", sender, receiver)
  299. // Now nuke the index
  300. log.Println("Resetting...")
  301. checkedStop(t, receiver)
  302. removeAll("h2/index*")
  303. // s1/file1 (remote) changes while receiver is down
  304. err = ioutil.WriteFile("s1/file1", []byte("goodbye\n"), 0644)
  305. if err != nil {
  306. t.Fatal(err)
  307. }
  308. // s1 must know about it
  309. err = sender.Rescan("default")
  310. if err != nil {
  311. t.Fatal(err)
  312. }
  313. // s2/file2 (local) changes while receiver is down
  314. err = ioutil.WriteFile("s2/file2", []byte("goodbye\n"), 0644)
  315. if err != nil {
  316. t.Fatal(err)
  317. }
  318. receiver = startInstance(t, 2)
  319. defer checkedStop(t, receiver)
  320. log.Println("Syncing...")
  321. rc.AwaitSync("default", sender, receiver)
  322. // s2 should have five files (three plus two conflicts)
  323. files, err = osutil.Glob("s2/file*")
  324. if err != nil {
  325. t.Fatal(err)
  326. }
  327. if len(files) != 5 {
  328. t.Errorf("Expected 5 files in s2 instead of %d", len(files))
  329. }
  330. // file1 is in conflict, so there's two versions of that one
  331. files, err = osutil.Glob("s2/file1*")
  332. if err != nil {
  333. t.Fatal(err)
  334. }
  335. if len(files) != 2 {
  336. t.Errorf("Expected 2 'file1' files in s2 instead of %d", len(files))
  337. }
  338. // file2 is in conflict, so there's two versions of that one
  339. files, err = osutil.Glob("s2/file2*")
  340. if err != nil {
  341. t.Fatal(err)
  342. }
  343. if len(files) != 2 {
  344. t.Errorf("Expected 2 'file2' files in s2 instead of %d", len(files))
  345. }
  346. }