conflict_test.go 8.4 KB

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