conflict_test.go 9.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496
  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. "path/filepath"
  13. "testing"
  14. "time"
  15. )
  16. func TestConflict(t *testing.T) {
  17. log.Println("Cleaning...")
  18. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  19. if err != nil {
  20. t.Fatal(err)
  21. }
  22. log.Println("Generating files...")
  23. err = generateFiles("s1", 100, 20, "../LICENSE")
  24. if err != nil {
  25. t.Fatal(err)
  26. }
  27. fd, err := os.Create("s1/testfile.txt")
  28. if err != nil {
  29. t.Fatal(err)
  30. }
  31. _, err = fd.WriteString("hello\n")
  32. if err != nil {
  33. t.Fatal(err)
  34. }
  35. err = fd.Close()
  36. if err != nil {
  37. t.Fatal(err)
  38. }
  39. expected, err := directoryContents("s1")
  40. if err != nil {
  41. t.Fatal(err)
  42. }
  43. sender, receiver := coSenderReceiver(t)
  44. defer sender.stop()
  45. defer receiver.stop()
  46. if err = coCompletion(sender, receiver); err != nil {
  47. t.Fatal(err)
  48. }
  49. sender.stop()
  50. receiver.stop()
  51. log.Println("Verifying...")
  52. actual, err := directoryContents("s2")
  53. if err != nil {
  54. t.Fatal(err)
  55. }
  56. err = compareDirectoryContents(actual, expected)
  57. if err != nil {
  58. t.Fatal(err)
  59. }
  60. log.Println("Introducing a conflict (simultaneous edit)...")
  61. fd, err = os.OpenFile("s1/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
  62. if err != nil {
  63. t.Fatal(err)
  64. }
  65. _, err = fd.WriteString("text added to s1\n")
  66. if err != nil {
  67. t.Fatal(err)
  68. }
  69. err = fd.Close()
  70. if err != nil {
  71. t.Fatal(err)
  72. }
  73. fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
  74. if err != nil {
  75. t.Fatal(err)
  76. }
  77. _, err = fd.WriteString("text added to s2\n")
  78. if err != nil {
  79. t.Fatal(err)
  80. }
  81. err = fd.Close()
  82. if err != nil {
  83. t.Fatal(err)
  84. }
  85. log.Println("Syncing...")
  86. err = receiver.start()
  87. err = sender.start()
  88. if err != nil {
  89. t.Fatal(err)
  90. }
  91. if err != nil {
  92. sender.stop()
  93. t.Fatal(err)
  94. }
  95. if err = coCompletion(sender, receiver); err != nil {
  96. t.Fatal(err)
  97. }
  98. sender.stop()
  99. receiver.stop()
  100. // The conflict is expected on the s2 side due to how we calculate which
  101. // file is the winner (based on device ID)
  102. files, err := osutil.Glob("s2/*sync-conflict*")
  103. if err != nil {
  104. t.Fatal(err)
  105. }
  106. if len(files) != 1 {
  107. t.Errorf("Expected 1 conflicted files instead of %d", len(files))
  108. }
  109. log.Println("Introducing a conflict (edit plus delete)...")
  110. err = os.Remove("s1/testfile.txt")
  111. if err != nil {
  112. t.Fatal(err)
  113. }
  114. fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
  115. if err != nil {
  116. t.Fatal(err)
  117. }
  118. _, err = fd.WriteString("more text added to s2\n")
  119. if err != nil {
  120. t.Fatal(err)
  121. }
  122. err = fd.Close()
  123. if err != nil {
  124. t.Fatal(err)
  125. }
  126. log.Println("Syncing...")
  127. err = receiver.start()
  128. err = sender.start()
  129. if err != nil {
  130. t.Fatal(err)
  131. }
  132. if err != nil {
  133. sender.stop()
  134. t.Fatal(err)
  135. }
  136. if err = coCompletion(sender, receiver); err != nil {
  137. t.Fatal(err)
  138. }
  139. sender.stop()
  140. receiver.stop()
  141. // The conflict should manifest on the s2 side again, where we should have
  142. // moved the file to a conflict copy instead of just deleting it.
  143. files, err = osutil.Glob("s2/*sync-conflict*")
  144. if err != nil {
  145. t.Fatal(err)
  146. }
  147. if len(files) != 2 {
  148. t.Errorf("Expected 2 conflicted files instead of %d", len(files))
  149. }
  150. }
  151. func TestInitialMergeConflicts(t *testing.T) {
  152. log.Println("Cleaning...")
  153. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  154. if err != nil {
  155. t.Fatal(err)
  156. }
  157. err = os.Mkdir("s1", 0755)
  158. if err != nil {
  159. t.Fatal(err)
  160. }
  161. err = os.Mkdir("s2", 0755)
  162. if err != nil {
  163. t.Fatal(err)
  164. }
  165. // File 1 is a conflict
  166. err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
  167. if err != nil {
  168. t.Fatal(err)
  169. }
  170. err = ioutil.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
  171. if err != nil {
  172. t.Fatal(err)
  173. }
  174. // File 2 exists on s1 only
  175. err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
  176. if err != nil {
  177. t.Fatal(err)
  178. }
  179. // File 3 exists on s2 only
  180. err = ioutil.WriteFile("s2/file3", []byte("goodbye\n"), 0644)
  181. if err != nil {
  182. t.Fatal(err)
  183. }
  184. // Let them sync
  185. sender, receiver := coSenderReceiver(t)
  186. defer sender.stop()
  187. defer receiver.stop()
  188. log.Println("Syncing...")
  189. if err = coCompletion(sender, receiver); err != nil {
  190. t.Fatal(err)
  191. }
  192. sender.stop()
  193. receiver.stop()
  194. log.Println("Verifying...")
  195. // s1 should have three-four files (there's a conflict from s2 which may or may not have synced yet)
  196. files, err := osutil.Glob("s1/file*")
  197. if err != nil {
  198. t.Fatal(err)
  199. }
  200. if len(files) < 3 || len(files) > 4 {
  201. t.Errorf("Expected 3-4 files in s1 instead of %d", len(files))
  202. }
  203. // s2 should have four files (there's a conflict)
  204. files, err = osutil.Glob("s2/file*")
  205. if err != nil {
  206. t.Fatal(err)
  207. }
  208. if len(files) != 4 {
  209. t.Errorf("Expected 4 files in s2 instead of %d", len(files))
  210. }
  211. // file1 is in conflict, so there's two versions of that one
  212. files, err = osutil.Glob("s2/file1*")
  213. if err != nil {
  214. t.Fatal(err)
  215. }
  216. if len(files) != 2 {
  217. t.Errorf("Expected 2 'file1' files in s2 instead of %d", len(files))
  218. }
  219. }
  220. func TestResetConflicts(t *testing.T) {
  221. log.Println("Cleaning...")
  222. err := removeAll("s1", "s2", "h1/index*", "h2/index*")
  223. if err != nil {
  224. t.Fatal(err)
  225. }
  226. err = os.Mkdir("s1", 0755)
  227. if err != nil {
  228. t.Fatal(err)
  229. }
  230. err = os.Mkdir("s2", 0755)
  231. if err != nil {
  232. t.Fatal(err)
  233. }
  234. // Three files on s1
  235. err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
  236. if err != nil {
  237. t.Fatal(err)
  238. }
  239. err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
  240. if err != nil {
  241. t.Fatal(err)
  242. }
  243. err = ioutil.WriteFile("s2/file3", []byte("hello\n"), 0644)
  244. if err != nil {
  245. t.Fatal(err)
  246. }
  247. // Let them sync
  248. sender, receiver := coSenderReceiver(t)
  249. defer sender.stop()
  250. defer receiver.stop()
  251. log.Println("Syncing...")
  252. if err = coCompletion(sender, receiver); err != nil {
  253. t.Fatal(err)
  254. }
  255. log.Println("Verifying...")
  256. // s1 should have three files
  257. files, err := osutil.Glob("s1/file*")
  258. if err != nil {
  259. t.Fatal(err)
  260. }
  261. if len(files) != 3 {
  262. t.Errorf("Expected 3 files in s1 instead of %d", len(files))
  263. }
  264. // s2 should have three
  265. files, err = osutil.Glob("s2/file*")
  266. if err != nil {
  267. t.Fatal(err)
  268. }
  269. if len(files) != 3 {
  270. t.Errorf("Expected 3 files in s2 instead of %d", len(files))
  271. }
  272. log.Println("Updating...")
  273. // change s2/file2 a few times, so that it's version counter increases.
  274. // This will make the file on the cluster look newer than what we have
  275. // locally after we rest the index, unless we have a fix for that.
  276. err = ioutil.WriteFile("s2/file2", []byte("hello1\n"), 0644)
  277. if err != nil {
  278. t.Fatal(err)
  279. }
  280. err = receiver.rescan("default")
  281. if err != nil {
  282. t.Fatal(err)
  283. }
  284. time.Sleep(time.Second)
  285. err = ioutil.WriteFile("s2/file2", []byte("hello2\n"), 0644)
  286. if err != nil {
  287. t.Fatal(err)
  288. }
  289. err = receiver.rescan("default")
  290. if err != nil {
  291. t.Fatal(err)
  292. }
  293. time.Sleep(time.Second)
  294. err = ioutil.WriteFile("s2/file2", []byte("hello3\n"), 0644)
  295. if err != nil {
  296. t.Fatal(err)
  297. }
  298. err = receiver.rescan("default")
  299. if err != nil {
  300. t.Fatal(err)
  301. }
  302. time.Sleep(time.Second)
  303. if err = coCompletion(sender, receiver); err != nil {
  304. t.Fatal(err)
  305. }
  306. // Now nuke the index
  307. log.Println("Resetting...")
  308. receiver.stop()
  309. removeAll("h2/index*")
  310. // s1/file1 (remote) changes while receiver is down
  311. err = ioutil.WriteFile("s1/file1", []byte("goodbye\n"), 0644)
  312. if err != nil {
  313. t.Fatal(err)
  314. }
  315. // s1 must know about it
  316. err = sender.rescan("default")
  317. if err != nil {
  318. t.Fatal(err)
  319. }
  320. // s2/file2 (local) changes while receiver is down
  321. err = ioutil.WriteFile("s2/file2", []byte("goodbye\n"), 0644)
  322. if err != nil {
  323. t.Fatal(err)
  324. }
  325. receiver.start()
  326. log.Println("Syncing...")
  327. if err = coCompletion(sender, receiver); err != nil {
  328. t.Fatal(err)
  329. }
  330. // s2 should have five files (three plus two conflicts)
  331. files, err = osutil.Glob("s2/file*")
  332. if err != nil {
  333. t.Fatal(err)
  334. }
  335. if len(files) != 5 {
  336. t.Errorf("Expected 5 files in s2 instead of %d", len(files))
  337. }
  338. // file1 is in conflict, so there's two versions of that one
  339. files, err = osutil.Glob("s2/file1*")
  340. if err != nil {
  341. t.Fatal(err)
  342. }
  343. if len(files) != 2 {
  344. t.Errorf("Expected 2 'file1' files in s2 instead of %d", len(files))
  345. }
  346. // file2 is in conflict, so there's two versions of that one
  347. files, err = osutil.Glob("s2/file2*")
  348. if err != nil {
  349. t.Fatal(err)
  350. }
  351. if len(files) != 2 {
  352. t.Errorf("Expected 2 'file2' files in s2 instead of %d", len(files))
  353. }
  354. }
  355. func coSenderReceiver(t *testing.T) (syncthingProcess, syncthingProcess) {
  356. log.Println("Starting sender...")
  357. sender := syncthingProcess{ // id1
  358. instance: "1",
  359. argv: []string{"-home", "h1"},
  360. port: 8081,
  361. apiKey: apiKey,
  362. }
  363. err := sender.start()
  364. if err != nil {
  365. t.Fatal(err)
  366. }
  367. log.Println("Starting receiver...")
  368. receiver := syncthingProcess{ // id2
  369. instance: "2",
  370. argv: []string{"-home", "h2"},
  371. port: 8082,
  372. apiKey: apiKey,
  373. }
  374. err = receiver.start()
  375. if err != nil {
  376. sender.stop()
  377. t.Fatal(err)
  378. }
  379. return sender, receiver
  380. }
  381. func coCompletion(p ...syncthingProcess) error {
  382. mainLoop:
  383. for {
  384. time.Sleep(2500 * time.Millisecond)
  385. tot := 0
  386. for i := range p {
  387. comp, err := p[i].peerCompletion()
  388. if err != nil {
  389. if isTimeout(err) {
  390. continue mainLoop
  391. }
  392. return err
  393. }
  394. for _, pct := range comp {
  395. tot += pct
  396. }
  397. }
  398. if tot == 100*(len(p)) {
  399. return nil
  400. }
  401. log.Printf("%d / %d...", tot, 100*(len(p)))
  402. }
  403. }