mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

remove obsolete garbage collection from streamsMap

Browse source
This commit is contained in:
Marten Seemann 2017-02-10 19:14:38 +07:00
parent 6d3e94bf21
commit 92aa9c2b13
No known key found for this signature in database
GPG key ID: 3603F40B121FCDEA
2 changed files with 9 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

92
streams_map_test.go
View file

@ -71,6 +71,10 @@ var _ = Describe("Streams Map", func() {
}
})
AfterEach(func() {
Expect(m.openStreams).To(HaveLen(len(m.streams)))
})
Context("getting and creating streams", func() {
Context("as a server", func() {
BeforeEach(func() {
@ -262,94 +266,6 @@ var _ = Describe("Streams Map", func() {
setNewStreamsMap(protocol.PerspectiveServer)
})
// TODO: remove when removing the openStreams slice
Context("DoS mitigation", func() {
It("opens and closes a lot of streams", func() {
for i := 1; i < 2*protocol.MaxNewStreamIDDelta; i += 2 {
streamID := protocol.StreamID(i)
_, err := m.GetOrOpenStream(streamID)
Expect(m.highestStreamOpenedByPeer).To(Equal(streamID))
Expect(err).NotTo(HaveOccurred())
err = m.RemoveStream(streamID)
Expect(err).NotTo(HaveOccurred())
}
})
PIt("prevents opening of streams with very low StreamIDs, if higher streams have already been opened", func() {
for i := 1; i < protocol.MaxNewStreamIDDelta+14; i += 2 {
if i == 11 || i == 13 {
continue
}
streamID := protocol.StreamID(i)
_, err := m.GetOrOpenStream(streamID)
Expect(err).NotTo(HaveOccurred())
err = m.RemoveStream(streamID)
Expect(err).NotTo(HaveOccurred())
}
Expect(m.highestStreamOpenedByPeer).To(Equal(protocol.StreamID(protocol.MaxNewStreamIDDelta + 13)))
_, err := m.GetOrOpenStream(11)
Expect(err).To(MatchError("InvalidStreamID: attempted to open stream 11, which is a lot smaller than the highest opened stream, 413"))
_, err = m.GetOrOpenStream(13)
Expect(err).ToNot(HaveOccurred())
})
It("garbage-collects closed streams", func() {
for i := 1; i < 4*protocol.MaxNewStreamIDDelta; i += 2 {
streamID := protocol.StreamID(i)
_, err := m.GetOrOpenStream(streamID)
Expect(m.highestStreamOpenedByPeer).To(Equal(streamID))
Expect(err).NotTo(HaveOccurred())
err = m.RemoveStream(streamID)
Expect(err).NotTo(HaveOccurred())
}
m.garbageCollectClosedStreams()
for i := 1; i < 3*protocol.MaxNewStreamIDDelta; i += 2 {
Expect(m.streams).ToNot(HaveKey(protocol.StreamID(i)))
}
for i := 3*protocol.MaxNewStreamIDDelta + 1; i < 4*protocol.MaxNewStreamIDDelta; i += 2 {
Expect(m.streams).To(HaveKey(protocol.StreamID(i)))
}
})
It("does not garbage-collects open streams", func() {
for i := 1; i < 1002; i += 2 {
streamID := protocol.StreamID(i)
_, err := m.GetOrOpenStream(streamID)
Expect(m.highestStreamOpenedByPeer).To(Equal(streamID))
Expect(err).NotTo(HaveOccurred())
if streamID != 23 {
err = m.RemoveStream(streamID)
Expect(err).NotTo(HaveOccurred())
}
}
lengthBefore := len(m.streams)
m.garbageCollectClosedStreams()
Expect(len(m.streams)).To(BeNumerically("<", lengthBefore))
Expect(m.streams).To(HaveKey(protocol.StreamID(23)))
Expect(m.streams[23]).ToNot(BeNil())
})
It("runs garbage-collection after a bunch of streams have been opened", func() {
numGarbageCollections := 0
numSavedStreams := 0
for i := 1; i < 4*protocol.MaxNewStreamIDDelta; i += 2 {
streamID := protocol.StreamID(i)
_, err := m.GetOrOpenStream(streamID)
Expect(m.highestStreamOpenedByPeer).To(Equal(streamID))
Expect(err).NotTo(HaveOccurred())
err = m.RemoveStream(streamID)
Expect(err).NotTo(HaveOccurred())
if len(m.streams) != numSavedStreams+1 {
numGarbageCollections++
}
numSavedStreams = len(m.streams)
}
Expect(numGarbageCollections).ToNot(BeZero())
Expect(numGarbageCollections).To(BeNumerically("<", 4))
Expect(len(m.streams)).To(BeNumerically("<", 2*protocol.MaxNewStreamIDDelta))
})
})
Context("deleting streams", func() {
BeforeEach(func() {
for i := 1; i <= 5; i++ {